Remove a lot of symbols from the namespace, otherwise sys/sysctl.h and

rpc/pmap_prot.h collide.. "struct pmap" from the kernel should not make
it out to userland.
ok miod

1 files changed, 17 insertions, 17 deletions

diff --git a/sys/arch/sparc/include/pmap.h b/sys/arch/sparc/include/pmap.h
index 449c5b6eb6e..e1a044208a5 100644
--- a/sys/arch/sparc/include/pmap.h
+++ b/sys/arch/sparc/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.42 2007/09/10 18:49:45 miod Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.43 2007/12/15 17:24:07 deraadt Exp $	*/
 /*	$NetBSD: pmap.h,v 1.30 1997/08/04 20:00:47 pk Exp $ */
 
 /*
@@ -127,6 +127,22 @@
 #define NKREG	((int)((-(unsigned)VM_MIN_KERNEL_ADDRESS) / NBPRG))	/* 8 */
 #define NUREG	(256 - NKREG)					      /* 248 */
 
+struct regmap {
+	struct segmap	*rg_segmap;	/* point to NSGPRG PMEGs */
+	int		*rg_seg_ptps; 	/* SRMMU-edible segment tables (NULL
+					 * indicates invalid region (4m) */
+	smeg_t		rg_smeg;	/* the MMU region number (4c) */
+	u_char		rg_nsegmap;	/* number of valid PMEGS */
+};
+
+struct segmap {
+	int	*sg_pte;		/* points to NPTESG PTEs */
+	pmeg_t	sg_pmeg;		/* the MMU segment number (4c) */
+	u_char	sg_npte;		/* number of valid PTEs per seg */
+};
+
+#ifdef _KERNEL
+
 TAILQ_HEAD(mmuhd,mmuentry);
 
 /*
@@ -157,20 +173,6 @@ struct pmap {
 	struct pmap_statistics	pm_stats;	/* pmap statistics */
 };
 
-struct regmap {
-	struct segmap	*rg_segmap;	/* point to NSGPRG PMEGs */
-	int		*rg_seg_ptps; 	/* SRMMU-edible segment tables (NULL
-					 * indicates invalid region (4m) */
-	smeg_t		rg_smeg;	/* the MMU region number (4c) */
-	u_char		rg_nsegmap;	/* number of valid PMEGS */
-};
-
-struct segmap {
-	int	*sg_pte;		/* points to NPTESG PTEs */
-	pmeg_t	sg_pmeg;		/* the MMU segment number (4c) */
-	u_char	sg_npte;		/* number of valid PTEs per seg */
-};
-
 typedef struct pmap *pmap_t;
 
 /*
@@ -214,8 +216,6 @@ struct kvm_cpustate {
 }/*not yet used*/;
 #endif
 
-#ifdef _KERNEL
-
 #define PMAP_NULL	((pmap_t)0)
 
 extern struct pmap	kernel_pmap_store;