Change #ifdef KERNEL to #ifdef _KERNEL in the public headers. "KERNEL"

is an application space macro and the applications are supposed to be free
to use it as they please (but cannot).  This is consistant with the other
BSD's who made this change quite some time ago.  More commits to come.

11 files changed, 18 insertions, 18 deletions

diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h
index 194ac28..7a1bd1b 100644
--- a/sys/vm/pmap.h
+++ b/sys/vm/pmap.h
@@ -86,7 +86,7 @@ typedef struct pmap_statistics *pmap_statistics_t;
 
 #include <machine/pmap.h>
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 struct proc;
 
@@ -142,6 +142,6 @@ void		 pmap_activate __P((struct proc *p));
 vm_offset_t	 pmap_addr_hint __P((vm_object_t obj, vm_offset_t addr, vm_size_t size));
 void		pmap_init2 __P((void));
 
-#endif /* KERNEL */
+#endif /* _KERNEL */
 
 #endif /* _PMAP_VM_ */
diff --git a/sys/vm/swap_pager.h b/sys/vm/swap_pager.h
index 308a6b1..b239952 100644
--- a/sys/vm/swap_pager.h
+++ b/sys/vm/swap_pager.h
@@ -83,7 +83,7 @@ struct swblock {
 	daddr_t		swb_pages[SWAP_META_PAGES];
 };
 
-#ifdef KERNEL
+#ifdef _KERNEL
 extern struct pagerlst swap_pager_un_object_list;
 extern int swap_pager_full;
 extern struct blist *swapblist;
diff --git a/sys/vm/vm.h b/sys/vm/vm.h
index 6d66211..38f04ac 100644
--- a/sys/vm/vm.h
+++ b/sys/vm/vm.h
@@ -95,7 +95,7 @@ typedef struct vm_map *vm_map_t;
 struct vm_object;
 typedef struct vm_object *vm_object_t;
 
-#ifndef KERNEL
+#ifndef _KERNEL
 /*
  * This is defined in <sys/types.h> for the kernel so that non-vm kernel
  * sources (mainly Mach-derived ones such as ddb) don't have to include
diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h
index fbaaabc..a473af9 100644
--- a/sys/vm/vm_extern.h
+++ b/sys/vm/vm_extern.h
@@ -44,7 +44,7 @@ struct vmtotal;
 struct mount;
 struct vnode;
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 #ifdef TYPEDEF_FOR_UAP
 int getpagesize __P((struct proc * p, void *, int *));
@@ -97,6 +97,6 @@ void vm_object_print __P((/* db_expr_t */ long, boolean_t, /* db_expr_t */ long,
 			  char *));
 int vm_fault_quick __P((caddr_t v, int prot));
 
-#endif				/* KERNEL */
+#endif				/* _KERNEL */
 
 #endif				/* !_VM_EXTERN_H_ */
diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h
index b02317b..43412cf 100644
--- a/sys/vm/vm_map.h
+++ b/sys/vm/vm_map.h
@@ -341,7 +341,7 @@ vmspace_resident_count(struct vmspace *vmspace)
 #define	VM_FAULT_HOLD 4			/* Hold the page */
 #define VM_FAULT_DIRTY 8		/* Dirty the page */
 
-#ifdef KERNEL
+#ifdef _KERNEL
 boolean_t vm_map_check_protection __P((vm_map_t, vm_offset_t, vm_offset_t, vm_prot_t));
 struct pmap;
 vm_map_t vm_map_create __P((struct pmap *, vm_offset_t, vm_offset_t));
diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index 165e0e1..5fb2e69 100644
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -151,7 +151,7 @@ struct vm_object {
 #define IDX_TO_OFF(idx) (((vm_ooffset_t)(idx)) << PAGE_SHIFT)
 #define OFF_TO_IDX(off) ((vm_pindex_t)(((vm_ooffset_t)(off)) >> PAGE_SHIFT))
 
-#ifdef	KERNEL
+#ifdef	_KERNEL
 
 #define OBJPC_SYNC	0x1			/* sync I/O */
 #define OBJPC_INVAL	0x2			/* invalidate */
@@ -166,9 +166,9 @@ extern struct object_q vm_object_list;	/* list of allocated objects */
 extern vm_object_t kernel_object;	/* the single kernel object */
 extern vm_object_t kmem_object;
 
-#endif				/* KERNEL */
+#endif				/* _KERNEL */
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 static __inline void
 vm_object_set_flag(vm_object_t object, u_int bits)
@@ -252,6 +252,6 @@ void vm_object_reference __P((vm_object_t));
 void vm_object_shadow __P((vm_object_t *, vm_ooffset_t *, vm_size_t));
 void vm_object_madvise __P((vm_object_t, vm_pindex_t, int, int));
 void vm_object_init2 __P((void));
-#endif				/* KERNEL */
+#endif				/* _KERNEL */
 
 #endif				/* _VM_OBJECT_ */
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index c5d2827..4d9f0c1 100644
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -247,7 +247,7 @@ extern struct vpgqueues vm_page_queues[PQ_COUNT];
 #define PFCLUSTER_BEHIND	3
 #define PFCLUSTER_AHEAD		3
 
-#ifdef KERNEL
+#ifdef _KERNEL
 /*
  * Each pageable resident page falls into one of four lists:
  *
@@ -606,5 +606,5 @@ vm_page_list_find(int basequeue, int index, boolean_t prefer_zero)
 
 #endif
 
-#endif				/* KERNEL */
+#endif				/* _KERNEL */
 #endif				/* !_VM_PAGE_ */
diff --git a/sys/vm/vm_pageout.h b/sys/vm/vm_pageout.h
index 7af6b06..306eaf3 100644
--- a/sys/vm/vm_pageout.h
+++ b/sys/vm/vm_pageout.h
@@ -104,7 +104,7 @@ extern void pagedaemon_wakeup __P((void));
 extern void vm_wait __P((void));
 extern void vm_await __P((void));
 
-#ifdef KERNEL
+#ifdef _KERNEL
 void vm_pageout_page __P((vm_page_t, vm_object_t));
 void vm_pageout_cluster __P((vm_page_t, vm_object_t));
 int vm_pageout_flush __P((vm_page_t *, int, int));
diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h
index d5df7c8..c548231 100644
--- a/sys/vm/vm_pager.h
+++ b/sys/vm/vm_pager.h
@@ -82,7 +82,7 @@ struct pagerops {
 #define	VM_PAGER_PUT_SYNC	0x1
 #define	VM_PAGER_PUT_INVAL	0x2
 
-#ifdef KERNEL
+#ifdef _KERNEL
 
 #ifdef MALLOC_DECLARE
 MALLOC_DECLARE(M_VMPGDATA);
diff --git a/sys/vm/vm_param.h b/sys/vm/vm_param.h
index 66733cc..a0809fe 100644
--- a/sys/vm/vm_param.h
+++ b/sys/vm/vm_param.h
@@ -118,9 +118,9 @@
 #define	KERN_NO_ACCESS		8
 
 #ifndef ASSEMBLER
-#ifdef KERNEL
+#ifdef _KERNEL
 #define num_pages(x) \
 	((vm_offset_t)((((vm_offset_t)(x)) + PAGE_MASK) >> PAGE_SHIFT))
-#endif				/* KERNEL */
+#endif				/* _KERNEL */
 #endif				/* ASSEMBLER */
 #endif				/* _VM_PARAM_ */
diff --git a/sys/vm/vnode_pager.h b/sys/vm/vnode_pager.h
index 339851d..03542fb 100644
--- a/sys/vm/vnode_pager.h
+++ b/sys/vm/vnode_pager.h
@@ -42,7 +42,7 @@
 #ifndef	_VNODE_PAGER_
 #define	_VNODE_PAGER_	1
 
-#ifdef KERNEL
+#ifdef _KERNEL
 vm_object_t vnode_pager_alloc __P((void *, vm_ooffset_t, vm_prot_t, vm_ooffset_t));
 void vnode_pager_freepage __P((vm_page_t m));
 struct vnode *vnode_pager_lock __P((vm_object_t));