Add namespace support for kvm

3 files changed, 6 insertions, 5 deletions

diff --git a/rtemsbsd/rtems/generate_kvm_symbols b/rtemsbsd/rtems/generate_kvm_symbols
index 6aa7dd66..8097c516 100755
--- a/rtemsbsd/rtems/generate_kvm_symbols
+++ b/rtemsbsd/rtems/generate_kvm_symbols
@@ -73,8 +73,9 @@ cat <<EOF
  * This file contains the known list of symbols for the kvm subsystem.
  */
 
+#include <machine/rtems-bsd-kernel-space.h>
+
 #include "kvm_private.h"
-#include "stdio.h"
 
 /*
  *  The following is the known list of symbols that may be passed
@@ -94,7 +95,7 @@ cat <<EOF
  *  to the kvm family of calls.
  */
 
-kvm_symval_t rtems_kvm_symbols[] = {
+const kvm_symval_t rtems_kvm_symbols[] = {
 EOF
 for sym in ${symbols}
 do
@@ -103,6 +104,6 @@ do
 done
 
 cat <<EOF
-  { "", (uintptr_t) NULL }
+  { "", 0 }
 };
 EOF
diff --git a/rtemsbsd/rtems/kvm_private.h b/rtemsbsd/rtems/kvm_private.h
index 5b9c9b04..b73fbae0 100644
--- a/rtemsbsd/rtems/kvm_private.h
+++ b/rtemsbsd/rtems/kvm_private.h
@@ -8,6 +8,6 @@ typedef struct {
   uintptr_t   value;
 } kvm_symval_t;
 
-extern kvm_symval_t rtems_kvm_symbols[];
+extern const kvm_symval_t rtems_kvm_symbols[];
 
 #endif
diff --git a/rtemsbsd/rtems/rtems-kvm.c b/rtemsbsd/rtems/rtems-kvm.c
index 27cfdd2d..bda2b600 100644
--- a/rtemsbsd/rtems/rtems-kvm.c
+++ b/rtemsbsd/rtems/rtems-kvm.c
@@ -34,7 +34,7 @@ kvm_nlist(kvm_t *kd, struct nlist *nl)
 	struct nlist *p;
 	int nvalid;
 	int error;
-	kvm_symval_t *kvm;
+	const kvm_symval_t *kvm;
 
 	assert( kd != NULL );
 	assert( nl != NULL );