Define the kernel pmap in the same way on arm as on every other

architecture.

Eliminate an unused definition.

Tested by:	cognet

2 files changed, 2 insertions, 5 deletions

diff --git a/sys/arm/arm/pmap.c b/sys/arm/arm/pmap.c
index b209bd7..cbd6c21 100644
--- a/sys/arm/arm/pmap.c
+++ b/sys/arm/arm/pmap.c
@@ -224,7 +224,6 @@ extern void *end;
 vm_offset_t kernel_vm_end = 0;
 
 struct pmap kernel_pmap_store;
-pmap_t kernel_pmap;
 
 static pt_entry_t *csrc_pte, *cdst_pte;
 static vm_offset_t csrcp, cdstp;
@@ -2337,7 +2336,6 @@ pmap_bootstrap(vm_offset_t firstaddr, vm_offset_t lastaddr, struct pv_addr *l1pt
 	    firstaddr, loadaddr));
 	
 	virtual_avail = firstaddr;
-	kernel_pmap = &kernel_pmap_store;
 	kernel_pmap->pm_l1 = l1;
 	kernel_l1pa = l1pt->pv_pa;
 	
diff --git a/sys/arm/include/pmap.h b/sys/arm/include/pmap.h
index 4a8d828..63ec3f4 100644
--- a/sys/arm/include/pmap.h
+++ b/sys/arm/include/pmap.h
@@ -138,7 +138,8 @@ struct	pmap {
 typedef struct pmap *pmap_t;
 
 #ifdef _KERNEL
-extern pmap_t	kernel_pmap;
+extern struct pmap	kernel_pmap_store;
+#define kernel_pmap	(&kernel_pmap_store)
 #define pmap_kernel() kernel_pmap
 
 #define	PMAP_ASSERT_LOCKED(pmap) \
@@ -166,8 +167,6 @@ typedef struct pv_entry {
 	int		pv_flags;	/* flags (wired, etc...) */
 } *pv_entry_t;
 
-#define PV_ENTRY_NULL   ((pv_entry_t) 0)
-
 #ifdef _KERNEL
 
 boolean_t pmap_get_pde_pte(pmap_t, vm_offset_t, pd_entry_t **, pt_entry_t **);