summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/boot/common/isapnp.h6
-rw-r--r--sys/cam/cam.h8
-rw-r--r--sys/cam/cam_ccb.h2
-rw-r--r--sys/cam/cam_conf.h4
-rw-r--r--sys/cam/cam_debug.h10
-rw-r--r--sys/cam/cam_extend.h4
-rw-r--r--sys/cam/cam_periph.h4
-rw-r--r--sys/cam/cam_queue.h4
-rw-r--r--sys/cam/cam_sim.h4
-rw-r--r--sys/cam/cam_xpt.h4
-rw-r--r--sys/cam/cam_xpt_periph.h4
-rw-r--r--sys/cam/cam_xpt_sim.h4
-rw-r--r--sys/coda/coda.h6
-rw-r--r--sys/conf/kmod.mk2
-rw-r--r--sys/crypto/des/des_locl.h2
-rw-r--r--sys/crypto/sha1.h2
-rw-r--r--sys/fs/cd9660/cd9660_node.h4
-rw-r--r--sys/fs/cd9660/iso.h4
-rw-r--r--sys/fs/coda/coda.h6
-rw-r--r--sys/fs/fdescfs/fdesc.h4
-rw-r--r--sys/fs/msdosfs/denode.h4
-rw-r--r--sys/fs/msdosfs/direntry.h4
-rw-r--r--sys/fs/msdosfs/fat.h4
-rw-r--r--sys/fs/msdosfs/msdosfsmount.h4
-rw-r--r--sys/fs/nullfs/null.h4
-rw-r--r--sys/fs/nwfs/nwfs.h4
-rw-r--r--sys/fs/nwfs/nwfs_mount.h4
-rw-r--r--sys/fs/portalfs/portal.h4
-rw-r--r--sys/fs/procfs/procfs.h4
-rw-r--r--sys/fs/umapfs/umap.h4
-rw-r--r--sys/fs/unionfs/union.h4
-rw-r--r--sys/gnu/ext2fs/ext2_mount.h4
-rw-r--r--sys/gnu/ext2fs/inode.h4
-rw-r--r--sys/gnu/fs/ext2fs/ext2_mount.h4
-rw-r--r--sys/gnu/fs/ext2fs/inode.h4
-rw-r--r--sys/isa/isavar.h4
-rw-r--r--sys/isa/pnpreg.h2
-rw-r--r--sys/isa/pnpvar.h4
-rw-r--r--sys/isofs/cd9660/cd9660_node.h4
-rw-r--r--sys/isofs/cd9660/iso.h4
-rw-r--r--sys/kern/inflate.c18
-rw-r--r--sys/kern/md5c.c4
-rw-r--r--sys/kern/subr_blist.c6
-rw-r--r--sys/libkern/mcount.c18
-rw-r--r--sys/miscfs/fdesc/fdesc.h4
-rw-r--r--sys/miscfs/kernfs/kernfs.h4
-rw-r--r--sys/miscfs/nullfs/null.h4
-rw-r--r--sys/miscfs/portal/portal.h4
-rw-r--r--sys/miscfs/procfs/procfs.h4
-rw-r--r--sys/miscfs/umapfs/umap.h4
-rw-r--r--sys/miscfs/union/union.h4
-rw-r--r--sys/modules/linux/Makefile4
-rw-r--r--sys/modules/svr4/Makefile6
-rw-r--r--sys/msdosfs/denode.h4
-rw-r--r--sys/msdosfs/direntry.h4
-rw-r--r--sys/msdosfs/fat.h4
-rw-r--r--sys/msdosfs/msdosfsmount.h4
-rw-r--r--sys/nfs/nfs.h8
-rw-r--r--sys/nfs/nfsmount.h4
-rw-r--r--sys/nfs/nfsnode.h6
-rw-r--r--sys/nfs/nqnfs.h2
-rw-r--r--sys/nfsclient/nfs.h8
-rw-r--r--sys/nfsclient/nfsargs.h8
-rw-r--r--sys/nfsclient/nfsmount.h4
-rw-r--r--sys/nfsclient/nfsnode.h6
-rw-r--r--sys/nfsclient/nfsstats.h8
-rw-r--r--sys/nfsserver/nfs.h8
-rw-r--r--sys/nfsserver/nfsrvstats.h8
-rw-r--r--sys/nwfs/nwfs.h4
-rw-r--r--sys/nwfs/nwfs_mount.h4
-rw-r--r--sys/pc98/pc98/pc98_machdep.h6
-rw-r--r--sys/pccard/cardinfo.h2
-rw-r--r--sys/pci/if_mn.c4
-rw-r--r--sys/pci/ncr.c16
-rw-r--r--sys/posix4/aio.h6
-rw-r--r--sys/posix4/mqueue.h5
-rw-r--r--sys/posix4/sched.h7
-rw-r--r--sys/posix4/semaphore.h5
-rw-r--r--sys/sys/semaphore.h5
-rw-r--r--sys/ufs/ffs/ffs_subr.c2
-rw-r--r--sys/ufs/ufs/inode.h4
-rw-r--r--sys/ufs/ufs/quota.h6
-rw-r--r--sys/ufs/ufs/ufsmount.h4
-rw-r--r--sys/vm/pmap.h4
-rw-r--r--sys/vm/swap_pager.h2
-rw-r--r--sys/vm/vm.h2
-rw-r--r--sys/vm/vm_extern.h4
-rw-r--r--sys/vm/vm_map.h2
-rw-r--r--sys/vm/vm_object.h8
-rw-r--r--sys/vm/vm_page.h4
-rw-r--r--sys/vm/vm_pageout.h2
-rw-r--r--sys/vm/vm_pager.h2
-rw-r--r--sys/vm/vm_param.h4
-rw-r--r--sys/vm/vnode_pager.h2
94 files changed, 229 insertions, 223 deletions
diff --git a/sys/boot/common/isapnp.h b/sys/boot/common/isapnp.h
index 3ebd66a..053ec0a 100644
--- a/sys/boot/common/isapnp.h
+++ b/sys/boot/common/isapnp.h
@@ -44,7 +44,7 @@
#define MAX_PNP_LDN 20
/* Static ports to access PnP state machine */
-#ifndef KERNEL
+#ifndef _KERNEL
#ifdef PC98
/* pnp.h is included from pnpinfo.c. */
#define _PNP_ADDRESS 0x259
@@ -267,7 +267,7 @@ struct pnp_cinfo {
} mem[4];
};
-#ifdef KERNEL
+#ifdef _KERNEL
struct pnp_device {
char *pd_name;
@@ -310,6 +310,6 @@ int enable_pnp_card(void);
*/
void pnp_configure __P((void));
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* !_I386_ISA_PNP_H_ */
diff --git a/sys/cam/cam.h b/sys/cam/cam.h
index b185457..28964bc 100644
--- a/sys/cam/cam.h
+++ b/sys/cam/cam.h
@@ -31,9 +31,9 @@
#ifndef _CAM_CAM_H
#define _CAM_CAM_H 1
-#ifdef KERNEL
+#ifdef _KERNEL
#include <opt_cam.h>
-#endif /* KERNEL */
+#endif
#include <sys/cdefs.h>
@@ -163,7 +163,7 @@ void cam_strvis(u_int8_t *dst, const u_int8_t *src, int srclen, int dstlen);
int cam_strmatch(const u_int8_t *str, const u_int8_t *pattern, int str_len);
__END_DECLS
-#ifdef KERNEL
+#ifdef _KERNEL
static __inline void cam_init_pinfo(cam_pinfo *pinfo);
static __inline void cam_init_pinfo(cam_pinfo *pinfo)
@@ -171,6 +171,6 @@ static __inline void cam_init_pinfo(cam_pinfo *pinfo)
pinfo->priority = CAM_PRIORITY_NONE;
pinfo->index = CAM_UNQUEUED_INDEX;
}
-#endif /* KERNEL */
+#endif
#endif /* _CAM_CAM_H */
diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h
index 2f4ad02..aa8e6d4 100644
--- a/sys/cam/cam_ccb.h
+++ b/sys/cam/cam_ccb.h
@@ -34,7 +34,7 @@
#include <sys/queue.h>
#include <sys/cdefs.h>
#include <sys/time.h>
-#ifndef KERNEL
+#ifndef _KERNEL
#include <sys/callout.h>
#endif
#include <cam/cam_debug.h>
diff --git a/sys/cam/cam_conf.h b/sys/cam/cam_conf.h
index fc777c1..6cdd811 100644
--- a/sys/cam/cam_conf.h
+++ b/sys/cam/cam_conf.h
@@ -31,7 +31,7 @@
#ifndef _CAM_CAM_CONF_H
#define _CAM_CAM_CONF_H 1
-#ifdef KERNEL
+#ifdef _KERNEL
#define CAMCONF_UNSPEC 255
#define CAMCONF_ANY 254
@@ -62,6 +62,6 @@ struct cam_periph_config
extern struct cam_sim_config cam_sinit[];
extern struct cam_periph_config cam_pinit[];
-#endif /* KERNEL */
+#endif
#endif /* _CAM_CAM_CONF_H */
diff --git a/sys/cam/cam_debug.h b/sys/cam/cam_debug.h
index aa1a50d..22c56c6 100644
--- a/sys/cam/cam_debug.h
+++ b/sys/cam/cam_debug.h
@@ -30,9 +30,9 @@
#ifndef _CAM_CAM_DEBUG_H
#define _CAM_CAM_DEBUG_H 1
-#if defined(CAMDEBUG) && defined(KERNEL)
+#if defined(CAMDEBUG) && defined(_KERNEL)
#include <machine/clock.h>
-#endif /* CAMDEBUG && KERNEL */
+#endif /* CAMDEBUG && _KERNEL */
/*
* Debugging flags.
@@ -47,7 +47,7 @@ typedef enum {
CAM_DEBUG_PERIPH = 0x20 /* print out peripheral calls */
} cam_debug_flags;
-#if defined(CAMDEBUG) && defined(KERNEL)
+#if defined(CAMDEBUG) && defined(_KERNEL)
/* Path we want to debug */
extern struct cam_path *cam_dpath;
@@ -80,12 +80,12 @@ extern u_int32_t cam_debug_delay;
DELAY(cam_debug_delay); \
}
-#else /* !CAMDEBUG || !KERNEL */
+#else /* !CAMDEBUG || !_KERNEL */
#define CAM_DEBUGGED(A, B) 0
#define CAM_DEBUG(A, B, C)
#define CAM_DEBUG_PRINT(A, B)
-#endif /* CAMDEBUG && KERNEL */
+#endif /* CAMDEBUG && _KERNEL */
#endif /* _CAM_CAM_DEBUG_H */
diff --git a/sys/cam/cam_extend.h b/sys/cam/cam_extend.h
index 21ade23..1ac3835 100644
--- a/sys/cam/cam_extend.h
+++ b/sys/cam/cam_extend.h
@@ -18,7 +18,7 @@
#ifndef _CAM_CAM_EXTEND_H
#define _CAM_CAM_EXTEND_H 1
-#ifdef KERNEL
+#ifdef _KERNEL
struct extend_array;
void *cam_extend_get(struct extend_array *ea, int index);
@@ -26,5 +26,5 @@ struct extend_array *cam_extend_new(void);
void *cam_extend_set(struct extend_array *ea, int index, void *value);
void cam_extend_release(struct extend_array *ea, int index);
-#endif /* KERNEL */
+#endif
#endif /* _CAM_CAM_EXTEND_H */
diff --git a/sys/cam/cam_periph.h b/sys/cam/cam_periph.h
index acb7bd6..633581f 100644
--- a/sys/cam/cam_periph.h
+++ b/sys/cam/cam_periph.h
@@ -33,7 +33,7 @@
#include <sys/queue.h>
-#ifdef KERNEL
+#ifdef _KERNEL
extern struct linker_set periphdriver_set;
@@ -144,5 +144,5 @@ void cam_periph_freeze_after_event(struct cam_periph *periph,
int cam_periph_error(union ccb *ccb, cam_flags camflags,
u_int32_t sense_flags, union ccb *save_ccb);
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* _CAM_CAM_PERIPH_H */
diff --git a/sys/cam/cam_queue.h b/sys/cam/cam_queue.h
index d345931..3d0a29c 100644
--- a/sys/cam/cam_queue.h
+++ b/sys/cam/cam_queue.h
@@ -31,7 +31,7 @@
#ifndef _CAM_CAM_QUEUE_H
#define _CAM_CAM_QUEUE_H 1
-#ifdef KERNEL
+#ifdef _KERNEL
#include <sys/queue.h>
@@ -234,5 +234,5 @@ cam_ccbq_release_opening(struct cam_ccbq *ccbq)
ccbq->devq_openings++;
}
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* _CAM_CAM_QUEUE_H */
diff --git a/sys/cam/cam_sim.h b/sys/cam/cam_sim.h
index 5325049..95e6dce 100644
--- a/sys/cam/cam_sim.h
+++ b/sys/cam/cam_sim.h
@@ -31,7 +31,7 @@
#ifndef _CAM_CAM_SIM_H
#define _CAM_CAM_SIM_H 1
-#ifdef KERNEL
+#ifdef _KERNEL
/*
* The sim driver creates a sim for each controller. The sim device
@@ -131,5 +131,5 @@ cam_sim_bus(struct cam_sim *sim)
return (sim->bus_id);
}
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* _CAM_CAM_SIM_H */
diff --git a/sys/cam/cam_xpt.h b/sys/cam/cam_xpt.h
index 6d41f6c..8eb77e0 100644
--- a/sys/cam/cam_xpt.h
+++ b/sys/cam/cam_xpt.h
@@ -46,7 +46,7 @@ struct cam_path;
/* Path functions */
-#ifdef KERNEL
+#ifdef _KERNEL
void xpt_action(union ccb *new_ccb);
void xpt_setup_ccb(struct ccb_hdr *ccb_h,
@@ -69,7 +69,7 @@ struct cam_sim *xpt_path_sim(struct cam_path *path);
struct cam_periph *xpt_path_periph(struct cam_path *path);
void xpt_async(u_int32_t async_code, struct cam_path *path,
void *async_arg);
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* _CAM_CAM_XPT_H */
diff --git a/sys/cam/cam_xpt_periph.h b/sys/cam/cam_xpt_periph.h
index 111402f..6281a15 100644
--- a/sys/cam/cam_xpt_periph.h
+++ b/sys/cam/cam_xpt_periph.h
@@ -36,7 +36,7 @@
#include <cam/cam_xpt.h>
/* Functions accessed by the peripheral drivers */
-#ifdef KERNEL
+#ifdef _KERNEL
void xpt_polled_action(union ccb *ccb);
union ccb *xpt_alloc_ccb(void);
void xpt_free_ccb(union ccb *free_ccb);
@@ -46,6 +46,6 @@ int32_t xpt_add_periph(struct cam_periph *periph);
void xpt_remove_periph(struct cam_periph *periph);
void xpt_announce_periph(struct cam_periph *periph,
char *announce_string);
-#endif /* KERNEL */
+#endif
#endif /* _CAM_CAM_XPT_PERIPH_H */
diff --git a/sys/cam/cam_xpt_sim.h b/sys/cam/cam_xpt_sim.h
index 698e638..62a53ec 100644
--- a/sys/cam/cam_xpt_sim.h
+++ b/sys/cam/cam_xpt_sim.h
@@ -36,7 +36,7 @@
#include <cam/cam_queue.h>
/* Functions accessed by SIM drivers */
-#ifdef KERNEL
+#ifdef _KERNEL
int32_t xpt_bus_register(struct cam_sim *sim, u_int32_t bus);
int32_t xpt_bus_deregister(u_int8_t path_id);
u_int32_t xpt_freeze_simq(struct cam_sim *sim, u_int count);
@@ -45,7 +45,7 @@ u_int32_t xpt_freeze_devq(struct cam_path *path, u_int count);
void xpt_release_devq(struct cam_path *path, u_int count,
int run_queue);
void xpt_done(union ccb *done_ccb);
-#endif /* KERNEL */
+#endif
#endif /* _CAM_CAM_XPT_SIM_H */
diff --git a/sys/coda/coda.h b/sys/coda/coda.h
index 5a25bc6..2e59cfc 100644
--- a/sys/coda/coda.h
+++ b/sys/coda/coda.h
@@ -53,7 +53,7 @@
#endif
#if defined(DJGPP) || defined(__CYGWIN32__)
-#ifdef KERNEL
+#ifdef _KERNEL
typedef unsigned long u_long;
typedef unsigned int u_int;
typedef unsigned short u_short;
@@ -72,11 +72,11 @@ struct timespec {
long ts_sec;
long ts_nsec;
};
-#else /* DJGPP but not KERNEL */
+#else /* DJGPP but not _KERNEL */
#include <sys/types.h>
#include <sys/time.h>
typedef unsigned long long u_quad_t;
-#endif /* !KERNEL */
+#endif /* !_KERNEL */
#endif /* !DJGPP */
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 05cc4bc..bc5aa99 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -89,7 +89,7 @@ __initialized__:
.SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S
-CFLAGS+= ${COPTS} -DKERNEL ${CWARNFLAGS}
+CFLAGS+= ${COPTS} -D_KERNEL ${CWARNFLAGS}
CFLAGS+= -DKLD_MODULE
# Don't use any standard or source-relative include directories.
diff --git a/sys/crypto/des/des_locl.h b/sys/crypto/des/des_locl.h
index 4f23984..ff49cc7 100644
--- a/sys/crypto/des/des_locl.h
+++ b/sys/crypto/des/des_locl.h
@@ -94,7 +94,7 @@
#undef NOPROTO
#endif
-#if !defined(KERNEL) && (defined(__STDC__) || defined(VMS) || defined(M_XENIX) || defined(MSDOS))
+#if !defined(_KERNEL) && (defined(__STDC__) || defined(VMS) || defined(M_XENIX) || defined(MSDOS))
#ifndef __NetBSD__
#include <string.h>
#endif
diff --git a/sys/crypto/sha1.h b/sys/crypto/sha1.h
index 05fdf27..a6a4fab 100644
--- a/sys/crypto/sha1.h
+++ b/sys/crypto/sha1.h
@@ -53,7 +53,7 @@ struct sha1_ctxt {
u_int8_t count;
};
-#if defined(KERNEL) || defined(_KERNEL)
+#ifdef _KERNEL
extern void sha1_init __P((struct sha1_ctxt *));
extern void sha1_pad __P((struct sha1_ctxt *));
extern void sha1_loop __P((struct sha1_ctxt *, caddr_t, size_t));
diff --git a/sys/fs/cd9660/cd9660_node.h b/sys/fs/cd9660/cd9660_node.h
index 0409efe..9f56150 100644
--- a/sys/fs/cd9660/cd9660_node.h
+++ b/sys/fs/cd9660/cd9660_node.h
@@ -92,7 +92,7 @@ struct iso_node {
#define VTOI(vp) ((struct iso_node *)(vp)->v_data)
#define ITOV(ip) ((ip)->i_vnode)
-#ifdef KERNEL
+#ifdef _KERNEL
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_ISOFSMNT);
@@ -123,4 +123,4 @@ void cd9660_ihashins __P((struct iso_node *));
int cd9660_tstamp_conv7 __P((u_char *, struct timespec *, enum ISO_FTYPE));
int cd9660_tstamp_conv17 __P((u_char *, struct timespec *));
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/fs/cd9660/iso.h b/sys/fs/cd9660/iso.h
index 6a685d2..f9a4abb 100644
--- a/sys/fs/cd9660/iso.h
+++ b/sys/fs/cd9660/iso.h
@@ -213,7 +213,7 @@ struct iso_extended_attributes {
u_char len_au [ISODCL (247, 250)]; /* 723 */
};
-#ifdef KERNEL
+#ifdef _KERNEL
/* CD-ROM Format type */
enum ISO_FTYPE { ISO_FTYPE_DEFAULT, ISO_FTYPE_9660, ISO_FTYPE_RRIP,
@@ -270,7 +270,7 @@ int isofncmp __P((u_char *, int, u_char *, int, int));
void isofntrans __P((u_char *, int, u_char *, u_short *, int, int, int));
ino_t isodirino __P((struct iso_directory_record *, struct iso_mnt *));
-#endif /* KERNEL */
+#endif /* _KERNEL */
/*
* The isonum_xxx functions are inlined anyway, and could come handy even
diff --git a/sys/fs/coda/coda.h b/sys/fs/coda/coda.h
index 5a25bc6..2e59cfc 100644
--- a/sys/fs/coda/coda.h
+++ b/sys/fs/coda/coda.h
@@ -53,7 +53,7 @@
#endif
#if defined(DJGPP) || defined(__CYGWIN32__)
-#ifdef KERNEL
+#ifdef _KERNEL
typedef unsigned long u_long;
typedef unsigned int u_int;
typedef unsigned short u_short;
@@ -72,11 +72,11 @@ struct timespec {
long ts_sec;
long ts_nsec;
};
-#else /* DJGPP but not KERNEL */
+#else /* DJGPP but not _KERNEL */
#include <sys/types.h>
#include <sys/time.h>
typedef unsigned long long u_quad_t;
-#endif /* !KERNEL */
+#endif /* !_KERNEL */
#endif /* !DJGPP */
diff --git a/sys/fs/fdescfs/fdesc.h b/sys/fs/fdescfs/fdesc.h
index 463e528..755149d 100644
--- a/sys/fs/fdescfs/fdesc.h
+++ b/sys/fs/fdescfs/fdesc.h
@@ -38,7 +38,7 @@
* $FreeBSD$
*/
-#ifdef KERNEL
+#ifdef _KERNEL
struct fdescmount {
struct vnode *f_root; /* Root node */
};
@@ -76,4 +76,4 @@ extern dev_t devctty;
extern int fdesc_init __P((struct vfsconf *));
extern int fdesc_root __P((struct mount *, struct vnode **));
extern int fdesc_allocvp __P((fdntype, int, struct mount *, struct vnode **));
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/fs/msdosfs/denode.h b/sys/fs/msdosfs/denode.h
index 49eac87..f57e014 100644
--- a/sys/fs/msdosfs/denode.h
+++ b/sys/fs/msdosfs/denode.h
@@ -212,7 +212,7 @@ struct denode {
#define de_forw de_chain[0]
#define de_back de_chain[1]
-#ifdef KERNEL
+#ifdef _KERNEL
#define VTODE(vp) ((struct denode *)(vp)->v_data)
#define DETOV(de) ((de)->de_vnode)
@@ -283,4 +283,4 @@ int deupdat __P((struct denode *dep, int waitfor));
int removede __P((struct denode *pdep, struct denode *dep));
int detrunc __P((struct denode *dep, u_long length, int flags, struct ucred *cred, struct proc *p));
int doscheckpath __P(( struct denode *source, struct denode *target));
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/fs/msdosfs/direntry.h b/sys/fs/msdosfs/direntry.h
index 3225b78..fccf58b 100644
--- a/sys/fs/msdosfs/direntry.h
+++ b/sys/fs/msdosfs/direntry.h
@@ -127,7 +127,7 @@ struct winentry {
#define DD_YEAR_MASK 0xFE00 /* year - 1980 */
#define DD_YEAR_SHIFT 9
-#ifdef KERNEL
+#ifdef _KERNEL
struct dirent;
void unix2dostime __P((struct timespec *tsp, u_int16_t *ddp,
u_int16_t *dtp, u_int8_t *dhp));
@@ -140,4 +140,4 @@ int win2unixfn __P((struct winentry *wep, struct dirent *dp, int chksum, int tab
u_int8_t winChksum __P((u_int8_t *name));
int winSlotCnt __P((const u_char *un, int unlen));
int winLenFixup __P((const u_char *un, int unlen));
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/fs/msdosfs/fat.h b/sys/fs/msdosfs/fat.h
index 9f20cba..7dd5bbf 100644
--- a/sys/fs/msdosfs/fat.h
+++ b/sys/fs/msdosfs/fat.h
@@ -83,7 +83,7 @@
#define MSDOSFSEOF(pmp, cn) ((((cn) | ~(pmp)->pm_fatmask) & CLUST_EOFS) == CLUST_EOFS)
-#ifdef KERNEL
+#ifdef _KERNEL
/*
* These are the values for the function argument to the function
* fatentry().
@@ -105,4 +105,4 @@ int freeclusterchain __P((struct msdosfsmount *pmp, u_long startchain));
int extendfile __P((struct denode *dep, u_long count, struct buf **bpp, u_long *ncp, int flags));
void fc_purge __P((struct denode *dep, u_int frcn));
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/fs/msdosfs/msdosfsmount.h b/sys/fs/msdosfs/msdosfsmount.h
index a8c2e5b..4b6ade1 100644
--- a/sys/fs/msdosfs/msdosfsmount.h
+++ b/sys/fs/msdosfs/msdosfsmount.h
@@ -51,7 +51,7 @@
#ifndef _MSDOSFS_MSDOSFSMOUNT_H_
#define _MSDOSFS_MSDOSFSMOUNT_H_
-#ifdef KERNEL
+#ifdef _KERNEL
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_MSDOSFSMNT);
@@ -193,7 +193,7 @@ struct msdosfsmount {
int msdosfs_init __P((struct vfsconf *vfsp));
int msdosfs_mountroot __P((void));
-#endif /* KERNEL */
+#endif /* _KERNEL */
/*
* Arguments to mount MSDOS filesystems.
diff --git a/sys/fs/nullfs/null.h b/sys/fs/nullfs/null.h
index fcd179e..2b7ed51 100644
--- a/sys/fs/nullfs/null.h
+++ b/sys/fs/nullfs/null.h
@@ -47,7 +47,7 @@ struct null_mount {
struct vnode *nullm_rootvp; /* Reference to root null_node */
};
-#ifdef KERNEL
+#ifdef _KERNEL
/*
* A cache of vnode references
*/
@@ -73,4 +73,4 @@ extern struct vnode *null_checkvp __P((struct vnode *vp, char *fil, int lno));
extern int null_bypass __P((struct vop_generic_args *ap));
extern vop_t **null_vnodeop_p;
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/fs/nwfs/nwfs.h b/sys/fs/nwfs/nwfs.h
index 51ae76b..e547869 100644
--- a/sys/fs/nwfs/nwfs.h
+++ b/sys/fs/nwfs/nwfs.h
@@ -49,7 +49,7 @@
#define NWFSIOC_GETEINFO _IOR('n',2,struct nw_entry_info)
#define NWFSIOC_GETNS _IOR('n',3,int)
-#ifdef KERNEL
+#ifdef _KERNEL
#include <sys/vnode.h>
#include <sys/mount.h>
@@ -78,6 +78,6 @@ int nwfs_ioctl(struct vop_ioctl_args *ap);
int nwfs_doio(struct buf *bp, struct ucred *cr, struct proc *p);
int nwfs_vinvalbuf(struct vnode *vp, int flags, struct ucred *cred,
struct proc *p, int intrflg);
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* _NWFS_H_ */
diff --git a/sys/fs/nwfs/nwfs_mount.h b/sys/fs/nwfs/nwfs_mount.h
index 02702ed..613e685 100644
--- a/sys/fs/nwfs/nwfs_mount.h
+++ b/sys/fs/nwfs/nwfs_mount.h
@@ -70,11 +70,11 @@ struct nwfs_args {
struct ncp_nlstables nls;
};
-#ifdef KERNEL
+#ifdef _KERNEL
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_NWFSMNT);
#endif
-#endif /* KERNEL */
+#endif
#endif /* !_NWFS_MOUNT_H_ */
diff --git a/sys/fs/portalfs/portal.h b/sys/fs/portalfs/portal.h
index 6e78145..ec46662 100644
--- a/sys/fs/portalfs/portal.h
+++ b/sys/fs/portalfs/portal.h
@@ -50,7 +50,7 @@ struct portal_cred {
gid_t pcr_groups[NGROUPS]; /* From ucred */
};
-#ifdef KERNEL
+#ifdef _KERNEL
struct portalmount {
struct vnode *pm_root; /* Root node */
struct file *pm_server; /* Held reference to server socket */
@@ -68,4 +68,4 @@ struct portalnode {
#define PORTAL_ROOTFILEID 2
extern vop_t **portal_vnodeop_p;
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/fs/procfs/procfs.h b/sys/fs/procfs/procfs.h
index 1402a7c..f000026 100644
--- a/sys/fs/procfs/procfs.h
+++ b/sys/fs/procfs/procfs.h
@@ -83,7 +83,7 @@ struct pfsnode {
/*
* Kernel stuff follows
*/
-#ifdef KERNEL
+#ifdef _KERNEL
#define CNEQ(cnp, s, len) \
((cnp)->cn_namelen == (len) && \
(bcmp((s), (cnp)->cn_nameptr, (len)) == 0))
@@ -159,4 +159,4 @@ extern vop_t **procfs_vnodeop_p;
int procfs_root __P((struct mount *, struct vnode **));
int procfs_rw __P((struct vop_read_args *));
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/fs/umapfs/umap.h b/sys/fs/umapfs/umap.h
index 856aeb9..eb562ed 100644
--- a/sys/fs/umapfs/umap.h
+++ b/sys/fs/umapfs/umap.h
@@ -62,7 +62,7 @@ struct umap_mount {
group mapping in ficus */
};
-#ifdef KERNEL
+#ifdef _KERNEL
/*
* A cache of vnode references
*/
@@ -88,4 +88,4 @@ extern struct vnode *umap_checkvp __P((struct vnode *vp, char *fil, int lno));
#endif
extern vop_t **umap_vnodeop_p;
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/fs/unionfs/union.h b/sys/fs/unionfs/union.h
index 3fb0b6e..a720d41 100644
--- a/sys/fs/unionfs/union.h
+++ b/sys/fs/unionfs/union.h
@@ -56,7 +56,7 @@ struct union_mount {
int um_op; /* Operation mode */
};
-#ifdef KERNEL
+#ifdef _KERNEL
#ifndef DIAGNOSTIC
#define DIAGNOSTIC
@@ -152,4 +152,4 @@ extern vop_t **union_vnodeop_p;
extern struct vfsops union_vfsops;
extern int uniondebug;
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/gnu/ext2fs/ext2_mount.h b/sys/gnu/ext2fs/ext2_mount.h
index 05f19da..0652545 100644
--- a/sys/gnu/ext2fs/ext2_mount.h
+++ b/sys/gnu/ext2fs/ext2_mount.h
@@ -55,7 +55,7 @@ struct mfs_args {
u_long size; /* size of file system */
};
-#ifdef KERNEL
+#ifdef _KERNEL
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_UFSMNT);
@@ -125,6 +125,6 @@ struct ufsmount {
#define MNINDIR(ump) ((ump)->um_nindir)
#define blkptrtodb(ump, b) ((b) << (ump)->um_bptrtodb)
#define is_sequential(ump, a, b) ((b) == (a) + ump->um_seqinc)
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif
diff --git a/sys/gnu/ext2fs/inode.h b/sys/gnu/ext2fs/inode.h
index 78fbc0a..83960b0 100644
--- a/sys/gnu/ext2fs/inode.h
+++ b/sys/gnu/ext2fs/inode.h
@@ -130,7 +130,7 @@ struct inode {
#define IN_HASHED 0x0080 /* Inode is on hash list */
#define IN_LAZYMOD 0x0100 /* Modified, but don't write yet. */
-#ifdef KERNEL
+#ifdef _KERNEL
/*
* Structure used to pass around logical block paths generated by
* ufs_getlbns and used by truncate and bmap code.
@@ -156,6 +156,6 @@ struct ufid {
ino_t ufid_ino; /* File number (ino). */
int32_t ufid_gen; /* Generation number. */
};
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* !_UFS_UFS_INODE_H_ */
diff --git a/sys/gnu/fs/ext2fs/ext2_mount.h b/sys/gnu/fs/ext2fs/ext2_mount.h
index 05f19da..0652545 100644
--- a/sys/gnu/fs/ext2fs/ext2_mount.h
+++ b/sys/gnu/fs/ext2fs/ext2_mount.h
@@ -55,7 +55,7 @@ struct mfs_args {
u_long size; /* size of file system */
};
-#ifdef KERNEL
+#ifdef _KERNEL
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_UFSMNT);
@@ -125,6 +125,6 @@ struct ufsmount {
#define MNINDIR(ump) ((ump)->um_nindir)
#define blkptrtodb(ump, b) ((b) << (ump)->um_bptrtodb)
#define is_sequential(ump, a, b) ((b) == (a) + ump->um_seqinc)
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif
diff --git a/sys/gnu/fs/ext2fs/inode.h b/sys/gnu/fs/ext2fs/inode.h
index 78fbc0a..83960b0 100644
--- a/sys/gnu/fs/ext2fs/inode.h
+++ b/sys/gnu/fs/ext2fs/inode.h
@@ -130,7 +130,7 @@ struct inode {
#define IN_HASHED 0x0080 /* Inode is on hash list */
#define IN_LAZYMOD 0x0100 /* Modified, but don't write yet. */
-#ifdef KERNEL
+#ifdef _KERNEL
/*
* Structure used to pass around logical block paths generated by
* ufs_getlbns and used by truncate and bmap code.
@@ -156,6 +156,6 @@ struct ufid {
ino_t ufid_ino; /* File number (ino). */
int32_t ufid_gen; /* Generation number. */
};
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* !_UFS_UFS_INODE_H_ */
diff --git a/sys/isa/isavar.h b/sys/isa/isavar.h
index a8e137c..2403681 100644
--- a/sys/isa/isavar.h
+++ b/sys/isa/isavar.h
@@ -36,7 +36,7 @@ typedef void isa_config_cb(void *arg, struct isa_config *config, int enable);
#include "isa_if.h"
#include <isa/pnpvar.h>
-#ifdef KERNEL
+#ifdef _KERNEL
/*
* ISA devices are partially ordered to ensure that devices which are
@@ -157,6 +157,6 @@ extern void isa_dma_release __P((int chan));
extern int isa_dmastatus __P((int chan));
extern int isa_dmastop __P((int chan));
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* !_ISA_ISAVAR_H_ */
diff --git a/sys/isa/pnpreg.h b/sys/isa/pnpreg.h
index 9c9b6f3..c5324f6 100644
--- a/sys/isa/pnpreg.h
+++ b/sys/isa/pnpreg.h
@@ -48,7 +48,7 @@
#endif
/* Static ports to access PnP state machine */
-#if defined(PC98) && defined(KERNEL)
+#if defined(PC98) && defined(_KERNEL)
/* pnp.h is included from pnpinfo.c. */
#define _PNP_ADDRESS 0x259
#define _PNP_WRITE_DATA 0xa59
diff --git a/sys/isa/pnpvar.h b/sys/isa/pnpvar.h
index 5f1a6dc..0e7dee9 100644
--- a/sys/isa/pnpvar.h
+++ b/sys/isa/pnpvar.h
@@ -29,7 +29,7 @@
#ifndef _ISA_PNPVAR_H_
#define _ISA_PNPVAR_H_
-#ifdef KERNEL
+#ifdef _KERNEL
#if 0
void pnp_write(int d, u_char r); /* used by Luigi's sound driver */
@@ -55,6 +55,6 @@ u_char pnp_read(int d); /* currently unused, but who knows... */
char *pnp_eisaformat(u_int32_t id);
void pnp_parse_resources(device_t dev, u_char *resources, int len);
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* !_ISA_PNPVAR_H_ */
diff --git a/sys/isofs/cd9660/cd9660_node.h b/sys/isofs/cd9660/cd9660_node.h
index 0409efe..9f56150 100644
--- a/sys/isofs/cd9660/cd9660_node.h
+++ b/sys/isofs/cd9660/cd9660_node.h
@@ -92,7 +92,7 @@ struct iso_node {
#define VTOI(vp) ((struct iso_node *)(vp)->v_data)
#define ITOV(ip) ((ip)->i_vnode)
-#ifdef KERNEL
+#ifdef _KERNEL
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_ISOFSMNT);
@@ -123,4 +123,4 @@ void cd9660_ihashins __P((struct iso_node *));
int cd9660_tstamp_conv7 __P((u_char *, struct timespec *, enum ISO_FTYPE));
int cd9660_tstamp_conv17 __P((u_char *, struct timespec *));
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/isofs/cd9660/iso.h b/sys/isofs/cd9660/iso.h
index 6a685d2..f9a4abb 100644
--- a/sys/isofs/cd9660/iso.h
+++ b/sys/isofs/cd9660/iso.h
@@ -213,7 +213,7 @@ struct iso_extended_attributes {
u_char len_au [ISODCL (247, 250)]; /* 723 */
};
-#ifdef KERNEL
+#ifdef _KERNEL
/* CD-ROM Format type */
enum ISO_FTYPE { ISO_FTYPE_DEFAULT, ISO_FTYPE_9660, ISO_FTYPE_RRIP,
@@ -270,7 +270,7 @@ int isofncmp __P((u_char *, int, u_char *, int, int));
void isofntrans __P((u_char *, int, u_char *, u_short *, int, int, int));
ino_t isodirino __P((struct iso_directory_record *, struct iso_mnt *));
-#endif /* KERNEL */
+#endif /* _KERNEL */
/*
* The isonum_xxx functions are inlined anyway, and could come handy even
diff --git a/sys/kern/inflate.c b/sys/kern/inflate.c
index f38e0bf..c101b7a 100644
--- a/sys/kern/inflate.c
+++ b/sys/kern/inflate.c
@@ -14,13 +14,13 @@
#include <sys/param.h>
#include <sys/inflate.h>
-#ifdef KERNEL
+#ifdef _KERNEL
#include <sys/systm.h>
#include <sys/kernel.h>
#endif
#include <sys/malloc.h>
-#ifdef KERNEL
+#ifdef _KERNEL
static MALLOC_DEFINE(M_GZIP, "Gzip trees", "Gzip trees");
#endif
@@ -30,11 +30,11 @@ static MALLOC_DEFINE(M_GZIP, "Gzip trees", "Gzip trees");
#define ulg u_long
/* Stuff to make inflate() work */
-#ifdef KERNEL
+#ifdef _KERNEL
#define memzero(dest,len) bzero(dest,len)
#endif
#define NOMEMCPY
-#ifdef KERNEL
+#ifdef _KERNEL
#define FPRINTF printf
#else
extern void putstr (char *);
@@ -49,7 +49,7 @@ extern void putstr (char *);
static const int qflag = 0;
-#ifndef KERNEL /* want to use this file in kzip also */
+#ifndef _KERNEL /* want to use this file in kzip also */
extern unsigned char *kzipmalloc (int);
extern void kzipfree (void*);
#define malloc(x, y, z) kzipmalloc((x))
@@ -447,7 +447,7 @@ huft_build(glbl, b, n, s, d, e, t, m)
/* Generate counts for each bit length */
el = n > 256 ? b[256] : BMAX; /* set length of EOB code, if any */
-#ifdef KERNEL
+#ifdef _KERNEL
memzero((char *) c, sizeof(c));
#else
for (i = 0; i < BMAX+1; i++)
@@ -1045,14 +1045,14 @@ inflate(glbl)
struct inflate *glbl;
{
int i;
-#ifdef KERNEL
+#ifdef _KERNEL
u_char *p = NULL;
if (!glbl->gz_slide)
p = glbl->gz_slide = malloc(GZ_WSIZE, M_GZIP, M_WAITOK);
#endif
if (!glbl->gz_slide)
-#ifdef KERNEL
+#ifdef _KERNEL
return(ENOMEM);
#else
return 3; /* kzip expects 3 */
@@ -1067,7 +1067,7 @@ inflate(glbl)
huft_free(glbl, glbl->gz_fixed_tl);
glbl->gz_fixed_tl = (struct huft *) NULL;
}
-#ifdef KERNEL
+#ifdef _KERNEL
if (p == glbl->gz_slide) {
free(glbl->gz_slide, M_GZIP);
glbl->gz_slide = NULL;
diff --git a/sys/kern/md5c.c b/sys/kern/md5c.c
index c4e3791..700d589 100644
--- a/sys/kern/md5c.c
+++ b/sys/kern/md5c.c
@@ -30,7 +30,7 @@
#include <sys/types.h>
-#ifdef KERNEL
+#ifdef _KERNEL
#include <sys/systm.h>
#else
#include <string.h>
@@ -39,7 +39,7 @@
#include <sys/md5.h>
-#ifdef KERNEL
+#ifdef _KERNEL
#define memset(x,y,z) bzero(x,z);
#define memcpy(x,y,z) bcopy(y, x, z)
#endif
diff --git a/sys/kern/subr_blist.c b/sys/kern/subr_blist.c
index 5455a7b..cad453f 100644
--- a/sys/kern/subr_blist.c
+++ b/sys/kern/subr_blist.c
@@ -63,7 +63,7 @@
* $FreeBSD$
*/
-#ifdef KERNEL
+#ifdef _KERNEL
#include <sys/param.h>
#include <sys/systm.h>
@@ -116,12 +116,12 @@ static void blst_copy(blmeta_t *scan, daddr_t blk, daddr_t radix,
daddr_t skip, blist_t dest, daddr_t count);
static daddr_t blst_radix_init(blmeta_t *scan, daddr_t radix,
int skip, daddr_t count);
-#ifndef KERNEL
+#ifndef _KERNEL
static void blst_radix_print(blmeta_t *scan, daddr_t blk,
daddr_t radix, int skip, int tab);
#endif
-#ifdef KERNEL
+#ifdef _KERNEL
static MALLOC_DEFINE(M_SWAP, "SWAP", "Swap space");
#endif
diff --git a/sys/libkern/mcount.c b/sys/libkern/mcount.c
index ca3c1c4..7480ff3 100644
--- a/sys/libkern/mcount.c
+++ b/sys/libkern/mcount.c
@@ -35,7 +35,7 @@
#include <sys/param.h>
#include <sys/gmon.h>
-#ifdef KERNEL
+#ifdef _KERNEL
#ifndef GUPROF
#include <sys/systm.h>
#endif
@@ -74,7 +74,7 @@ _MCOUNT_DECL(frompc, selfpc) /* _mcount; may be static, inline, etc */
register struct tostruct *top, *prevtop;
register struct gmonparam *p;
register long toindex;
-#ifdef KERNEL
+#ifdef _KERNEL
MCOUNT_DECL(s)
#endif
@@ -87,14 +87,14 @@ _MCOUNT_DECL(frompc, selfpc) /* _mcount; may be static, inline, etc */
if (p->state != GMON_PROF_ON)
return;
#endif
-#ifdef KERNEL
+#ifdef _KERNEL
MCOUNT_ENTER(s);
#else
p->state = GMON_PROF_BUSY;
#endif
frompci = frompc - p->lowpc;
-#ifdef KERNEL
+#ifdef _KERNEL
/*
* When we are called from an exception handler, frompci may be
* for a user address. Convert such frompci's to the index of
@@ -108,7 +108,7 @@ _MCOUNT_DECL(frompc, selfpc) /* _mcount; may be static, inline, etc */
if (frompci >= p->textsize)
goto done;
}
-#endif /* KERNEL */
+#endif
#ifdef GUPROF
if (p->state == GMON_PROF_HIRES) {
@@ -140,7 +140,7 @@ _MCOUNT_DECL(frompc, selfpc) /* _mcount; may be static, inline, etc */
}
#endif /* GUPROF */
-#ifdef KERNEL
+#ifdef _KERNEL
/*
* When we are called from an exception handler, frompc is faked
* to be for where the exception occurred. We've just solidified
@@ -156,7 +156,7 @@ _MCOUNT_DECL(frompc, selfpc) /* _mcount; may be static, inline, etc */
else
frompci = (uintfptr_t)btrap - p->lowpc;
}
-#endif /* KERNEL */
+#endif
/*
* check that frompc is a reasonable pc value.
@@ -238,7 +238,7 @@ _MCOUNT_DECL(frompc, selfpc) /* _mcount; may be static, inline, etc */
}
done:
-#ifdef KERNEL
+#ifdef _KERNEL
MCOUNT_EXIT(s);
#else
p->state = GMON_PROF_ON;
@@ -246,7 +246,7 @@ done:
return;
overflow:
p->state = GMON_PROF_ERROR;
-#ifdef KERNEL
+#ifdef _KERNEL
MCOUNT_EXIT(s);
#endif
return;
diff --git a/sys/miscfs/fdesc/fdesc.h b/sys/miscfs/fdesc/fdesc.h
index 463e528..755149d 100644
--- a/sys/miscfs/fdesc/fdesc.h
+++ b/sys/miscfs/fdesc/fdesc.h
@@ -38,7 +38,7 @@
* $FreeBSD$
*/
-#ifdef KERNEL
+#ifdef _KERNEL
struct fdescmount {
struct vnode *f_root; /* Root node */
};
@@ -76,4 +76,4 @@ extern dev_t devctty;
extern int fdesc_init __P((struct vfsconf *));
extern int fdesc_root __P((struct mount *, struct vnode **));
extern int fdesc_allocvp __P((fdntype, int, struct mount *, struct vnode **));
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/miscfs/kernfs/kernfs.h b/sys/miscfs/kernfs/kernfs.h
index bb03fea..9f826d2 100644
--- a/sys/miscfs/kernfs/kernfs.h
+++ b/sys/miscfs/kernfs/kernfs.h
@@ -39,7 +39,7 @@
#define _PATH_KERNFS "/kern" /* Default mountpoint */
-#ifdef KERNEL
+#ifdef _KERNEL
struct kernfs_mount {
struct vnode *kf_root; /* Root node */
};
@@ -53,4 +53,4 @@ struct kernfs_node {
extern vop_t **kernfs_vnodeop_p;
extern dev_t rrootdev;
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/miscfs/nullfs/null.h b/sys/miscfs/nullfs/null.h
index fcd179e..2b7ed51 100644
--- a/sys/miscfs/nullfs/null.h
+++ b/sys/miscfs/nullfs/null.h
@@ -47,7 +47,7 @@ struct null_mount {
struct vnode *nullm_rootvp; /* Reference to root null_node */
};
-#ifdef KERNEL
+#ifdef _KERNEL
/*
* A cache of vnode references
*/
@@ -73,4 +73,4 @@ extern struct vnode *null_checkvp __P((struct vnode *vp, char *fil, int lno));
extern int null_bypass __P((struct vop_generic_args *ap));
extern vop_t **null_vnodeop_p;
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/miscfs/portal/portal.h b/sys/miscfs/portal/portal.h
index 6e78145..ec46662 100644
--- a/sys/miscfs/portal/portal.h
+++ b/sys/miscfs/portal/portal.h
@@ -50,7 +50,7 @@ struct portal_cred {
gid_t pcr_groups[NGROUPS]; /* From ucred */
};
-#ifdef KERNEL
+#ifdef _KERNEL
struct portalmount {
struct vnode *pm_root; /* Root node */
struct file *pm_server; /* Held reference to server socket */
@@ -68,4 +68,4 @@ struct portalnode {
#define PORTAL_ROOTFILEID 2
extern vop_t **portal_vnodeop_p;
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/miscfs/procfs/procfs.h b/sys/miscfs/procfs/procfs.h
index 1402a7c..f000026 100644
--- a/sys/miscfs/procfs/procfs.h
+++ b/sys/miscfs/procfs/procfs.h
@@ -83,7 +83,7 @@ struct pfsnode {
/*
* Kernel stuff follows
*/
-#ifdef KERNEL
+#ifdef _KERNEL
#define CNEQ(cnp, s, len) \
((cnp)->cn_namelen == (len) && \
(bcmp((s), (cnp)->cn_nameptr, (len)) == 0))
@@ -159,4 +159,4 @@ extern vop_t **procfs_vnodeop_p;
int procfs_root __P((struct mount *, struct vnode **));
int procfs_rw __P((struct vop_read_args *));
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/miscfs/umapfs/umap.h b/sys/miscfs/umapfs/umap.h
index 856aeb9..eb562ed 100644
--- a/sys/miscfs/umapfs/umap.h
+++ b/sys/miscfs/umapfs/umap.h
@@ -62,7 +62,7 @@ struct umap_mount {
group mapping in ficus */
};
-#ifdef KERNEL
+#ifdef _KERNEL
/*
* A cache of vnode references
*/
@@ -88,4 +88,4 @@ extern struct vnode *umap_checkvp __P((struct vnode *vp, char *fil, int lno));
#endif
extern vop_t **umap_vnodeop_p;
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/miscfs/union/union.h b/sys/miscfs/union/union.h
index 3fb0b6e..a720d41 100644
--- a/sys/miscfs/union/union.h
+++ b/sys/miscfs/union/union.h
@@ -56,7 +56,7 @@ struct union_mount {
int um_op; /* Operation mode */
};
-#ifdef KERNEL
+#ifdef _KERNEL
#ifndef DIAGNOSTIC
#define DIAGNOSTIC
@@ -152,4 +152,4 @@ extern vop_t **union_vnodeop_p;
extern struct vfsops union_vfsops;
extern int uniondebug;
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index 1e7a5ce..8ccccac 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -20,11 +20,11 @@ linux_assym.h: linux_genassym.o
genassym -o ${.TARGET} ${.ALLSRC}
linux_locore.o: linux_locore.s linux_assym.h
- ${CC} -c -x assembler-with-cpp -DLOCORE -DKERNEL ${CFLAGS} \
+ ${CC} -c -x assembler-with-cpp -DLOCORE -D_KERNEL ${CFLAGS} \
${.IMPSRC} -o ${.TARGET}
linux_genassym.o: linux_genassym.c linux.h @ machine
- ${CC} -c ${CFLAGS} -UKERNEL ${.IMPSRC}
+ ${CC} -c ${CFLAGS} -U_KERNEL ${.IMPSRC}
opt_compat.h:
echo "#define COMPAT_43 1" > opt_compat.h
diff --git a/sys/modules/svr4/Makefile b/sys/modules/svr4/Makefile
index 6c048c7..7901455 100644
--- a/sys/modules/svr4/Makefile
+++ b/sys/modules/svr4/Makefile
@@ -10,7 +10,7 @@ SRCS= svr4_sysent.c svr4_sysvec.c opt_compat.h opt_global.h opt_vmpage.h \
OBJS= svr4_locore.o
NOMAN=1
MAN8= svr4.8
-CFLAGS+= -DKERNEL
+CFLAGS+= -D_KERNEL
MAINTAINER= newton@freebsd.org
EXPORT_SYMS=_svr4_mod
@@ -22,11 +22,11 @@ svr4_assym.h: svr4_genassym.o
genassym -o ${.TARGET} ${.ALLSRC}
svr4_locore.o: svr4_locore.s svr4_assym.h
- ${CC} -c -x assembler-with-cpp -DLOCORE -DKERNEL ${CFLAGS} \
+ ${CC} -c -x assembler-with-cpp -DLOCORE -D_KERNEL ${CFLAGS} \
${.IMPSRC} -o ${.TARGET}
svr4_genassym.o: svr4_genassym.c svr4.h @ machine
- ${CC} -c ${CFLAGS} -UKERNEL ${.IMPSRC}
+ ${CC} -c ${CFLAGS} -U_KERNEL ${.IMPSRC}
opt_compat.h:
echo "#define COMPAT_43 1" > opt_compat.h
diff --git a/sys/msdosfs/denode.h b/sys/msdosfs/denode.h
index 49eac87..f57e014 100644
--- a/sys/msdosfs/denode.h
+++ b/sys/msdosfs/denode.h
@@ -212,7 +212,7 @@ struct denode {
#define de_forw de_chain[0]
#define de_back de_chain[1]
-#ifdef KERNEL
+#ifdef _KERNEL
#define VTODE(vp) ((struct denode *)(vp)->v_data)
#define DETOV(de) ((de)->de_vnode)
@@ -283,4 +283,4 @@ int deupdat __P((struct denode *dep, int waitfor));
int removede __P((struct denode *pdep, struct denode *dep));
int detrunc __P((struct denode *dep, u_long length, int flags, struct ucred *cred, struct proc *p));
int doscheckpath __P(( struct denode *source, struct denode *target));
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/msdosfs/direntry.h b/sys/msdosfs/direntry.h
index 3225b78..fccf58b 100644
--- a/sys/msdosfs/direntry.h
+++ b/sys/msdosfs/direntry.h
@@ -127,7 +127,7 @@ struct winentry {
#define DD_YEAR_MASK 0xFE00 /* year - 1980 */
#define DD_YEAR_SHIFT 9
-#ifdef KERNEL
+#ifdef _KERNEL
struct dirent;
void unix2dostime __P((struct timespec *tsp, u_int16_t *ddp,
u_int16_t *dtp, u_int8_t *dhp));
@@ -140,4 +140,4 @@ int win2unixfn __P((struct winentry *wep, struct dirent *dp, int chksum, int tab
u_int8_t winChksum __P((u_int8_t *name));
int winSlotCnt __P((const u_char *un, int unlen));
int winLenFixup __P((const u_char *un, int unlen));
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/msdosfs/fat.h b/sys/msdosfs/fat.h
index 9f20cba..7dd5bbf 100644
--- a/sys/msdosfs/fat.h
+++ b/sys/msdosfs/fat.h
@@ -83,7 +83,7 @@
#define MSDOSFSEOF(pmp, cn) ((((cn) | ~(pmp)->pm_fatmask) & CLUST_EOFS) == CLUST_EOFS)
-#ifdef KERNEL
+#ifdef _KERNEL
/*
* These are the values for the function argument to the function
* fatentry().
@@ -105,4 +105,4 @@ int freeclusterchain __P((struct msdosfsmount *pmp, u_long startchain));
int extendfile __P((struct denode *dep, u_long count, struct buf **bpp, u_long *ncp, int flags));
void fc_purge __P((struct denode *dep, u_int frcn));
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/msdosfs/msdosfsmount.h b/sys/msdosfs/msdosfsmount.h
index a8c2e5b..4b6ade1 100644
--- a/sys/msdosfs/msdosfsmount.h
+++ b/sys/msdosfs/msdosfsmount.h
@@ -51,7 +51,7 @@
#ifndef _MSDOSFS_MSDOSFSMOUNT_H_
#define _MSDOSFS_MSDOSFSMOUNT_H_
-#ifdef KERNEL
+#ifdef _KERNEL
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_MSDOSFSMNT);
@@ -193,7 +193,7 @@ struct msdosfsmount {
int msdosfs_init __P((struct vfsconf *vfsp));
int msdosfs_mountroot __P((void));
-#endif /* KERNEL */
+#endif /* _KERNEL */
/*
* Arguments to mount MSDOS filesystems.
diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h
index 75a3982..2d009a1 100644
--- a/sys/nfs/nfs.h
+++ b/sys/nfs/nfs.h
@@ -40,7 +40,7 @@
#ifndef _NFS_NFS_H_
#define _NFS_NFS_H_
-#ifdef KERNEL
+#ifdef _KERNEL
#include "opt_nfs.h"
#endif
@@ -83,7 +83,7 @@
#define NFS_GATHERDELAY 10 /* Default write gather delay (msec) */
#endif
#define NFS_DIRBLKSIZ 4096 /* Must be a multiple of DIRBLKSIZ */
-#ifdef KERNEL
+#ifdef _KERNEL
#define DIRBLKSIZ 512 /* XXX we used to use ufs's DIRBLKSIZ */
#endif
@@ -299,7 +299,7 @@ struct nfsstats {
{ "nfsprivport", CTLTYPE_INT }, \
}
-#ifdef KERNEL
+#ifdef _KERNEL
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_NFSREQ);
@@ -734,6 +734,6 @@ int nfsrv_write __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
struct proc *procp, struct mbuf **mrq));
void nfsrv_rcv __P((struct socket *so, void *arg, int waitflag));
void nfsrv_slpderef __P((struct nfssvc_sock *slp));
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif
diff --git a/sys/nfs/nfsmount.h b/sys/nfs/nfsmount.h
index 77ac7e3..8efd1df 100644
--- a/sys/nfs/nfsmount.h
+++ b/sys/nfs/nfsmount.h
@@ -95,12 +95,12 @@ struct nfsmount {
u_int64_t nm_maxfilesize; /* maximum file size */
};
-#if defined(KERNEL) || defined(_KERNEL)
+#if defined(_KERNEL)
/*
* Convert mount ptr to nfsmount ptr.
*/
#define VFSTONFS(mp) ((struct nfsmount *)((mp)->mnt_data))
-#endif /* KERNEL */
+#endif
#endif
diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h
index e654bc0..dac6020 100644
--- a/sys/nfs/nfsnode.h
+++ b/sys/nfs/nfsnode.h
@@ -41,7 +41,7 @@
#ifndef _NFS_NFSNODE_H_
#define _NFS_NFSNODE_H_
-#if !defined(_NFS_NFS_H_) && !defined(KERNEL)
+#if !defined(_NFS_NFS_H_) && !defined(_KERNEL)
#include <nfs/nfs.h>
#endif
@@ -157,7 +157,7 @@ extern TAILQ_HEAD(nfs_bufq, buf) nfs_bufq;
extern struct proc *nfs_iodwant[NFS_MAXASYNCDAEMON];
extern struct nfsmount *nfs_iodmount[NFS_MAXASYNCDAEMON];
-#if defined(KERNEL) || defined(_KERNEL)
+#if defined(_KERNEL)
/*
* nfs_rslock - Attempt to obtain lock on nfsnode
@@ -205,6 +205,6 @@ void nfs_invaldir __P((struct vnode *));
#define nqnfs_lease_updatetime nfs_lease_updatetime
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif
diff --git a/sys/nfs/nqnfs.h b/sys/nfs/nqnfs.h
index 2ba78ae..9afe58d 100644
--- a/sys/nfs/nqnfs.h
+++ b/sys/nfs/nqnfs.h
@@ -62,7 +62,7 @@
#define NQNFS_VER3 3
#define NQNFS_EVICTSIZ 156 /* Size of eviction request in bytes */
-#if defined(KERNEL) || defined(_KERNEL)
+#if defined(_KERNEL)
/*
* Definitions used for saving the "last lease expires" time in Non-volatile
* RAM on the server. The default definitions below assume that NOVRAM is not
diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h
index 75a3982..2d009a1 100644
--- a/sys/nfsclient/nfs.h
+++ b/sys/nfsclient/nfs.h
@@ -40,7 +40,7 @@
#ifndef _NFS_NFS_H_
#define _NFS_NFS_H_
-#ifdef KERNEL
+#ifdef _KERNEL
#include "opt_nfs.h"
#endif
@@ -83,7 +83,7 @@
#define NFS_GATHERDELAY 10 /* Default write gather delay (msec) */
#endif
#define NFS_DIRBLKSIZ 4096 /* Must be a multiple of DIRBLKSIZ */
-#ifdef KERNEL
+#ifdef _KERNEL
#define DIRBLKSIZ 512 /* XXX we used to use ufs's DIRBLKSIZ */
#endif
@@ -299,7 +299,7 @@ struct nfsstats {
{ "nfsprivport", CTLTYPE_INT }, \
}
-#ifdef KERNEL
+#ifdef _KERNEL
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_NFSREQ);
@@ -734,6 +734,6 @@ int nfsrv_write __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
struct proc *procp, struct mbuf **mrq));
void nfsrv_rcv __P((struct socket *so, void *arg, int waitflag));
void nfsrv_slpderef __P((struct nfssvc_sock *slp));
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif
diff --git a/sys/nfsclient/nfsargs.h b/sys/nfsclient/nfsargs.h
index 75a3982..2d009a1 100644
--- a/sys/nfsclient/nfsargs.h
+++ b/sys/nfsclient/nfsargs.h
@@ -40,7 +40,7 @@
#ifndef _NFS_NFS_H_
#define _NFS_NFS_H_
-#ifdef KERNEL
+#ifdef _KERNEL
#include "opt_nfs.h"
#endif
@@ -83,7 +83,7 @@
#define NFS_GATHERDELAY 10 /* Default write gather delay (msec) */
#endif
#define NFS_DIRBLKSIZ 4096 /* Must be a multiple of DIRBLKSIZ */
-#ifdef KERNEL
+#ifdef _KERNEL
#define DIRBLKSIZ 512 /* XXX we used to use ufs's DIRBLKSIZ */
#endif
@@ -299,7 +299,7 @@ struct nfsstats {
{ "nfsprivport", CTLTYPE_INT }, \
}
-#ifdef KERNEL
+#ifdef _KERNEL
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_NFSREQ);
@@ -734,6 +734,6 @@ int nfsrv_write __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
struct proc *procp, struct mbuf **mrq));
void nfsrv_rcv __P((struct socket *so, void *arg, int waitflag));
void nfsrv_slpderef __P((struct nfssvc_sock *slp));
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif
diff --git a/sys/nfsclient/nfsmount.h b/sys/nfsclient/nfsmount.h
index 77ac7e3..8efd1df 100644
--- a/sys/nfsclient/nfsmount.h
+++ b/sys/nfsclient/nfsmount.h
@@ -95,12 +95,12 @@ struct nfsmount {
u_int64_t nm_maxfilesize; /* maximum file size */
};
-#if defined(KERNEL) || defined(_KERNEL)
+#if defined(_KERNEL)
/*
* Convert mount ptr to nfsmount ptr.
*/
#define VFSTONFS(mp) ((struct nfsmount *)((mp)->mnt_data))
-#endif /* KERNEL */
+#endif
#endif
diff --git a/sys/nfsclient/nfsnode.h b/sys/nfsclient/nfsnode.h
index e654bc0..dac6020 100644
--- a/sys/nfsclient/nfsnode.h
+++ b/sys/nfsclient/nfsnode.h
@@ -41,7 +41,7 @@
#ifndef _NFS_NFSNODE_H_
#define _NFS_NFSNODE_H_
-#if !defined(_NFS_NFS_H_) && !defined(KERNEL)
+#if !defined(_NFS_NFS_H_) && !defined(_KERNEL)
#include <nfs/nfs.h>
#endif
@@ -157,7 +157,7 @@ extern TAILQ_HEAD(nfs_bufq, buf) nfs_bufq;
extern struct proc *nfs_iodwant[NFS_MAXASYNCDAEMON];
extern struct nfsmount *nfs_iodmount[NFS_MAXASYNCDAEMON];
-#if defined(KERNEL) || defined(_KERNEL)
+#if defined(_KERNEL)
/*
* nfs_rslock - Attempt to obtain lock on nfsnode
@@ -205,6 +205,6 @@ void nfs_invaldir __P((struct vnode *));
#define nqnfs_lease_updatetime nfs_lease_updatetime
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif
diff --git a/sys/nfsclient/nfsstats.h b/sys/nfsclient/nfsstats.h
index 75a3982..2d009a1 100644
--- a/sys/nfsclient/nfsstats.h
+++ b/sys/nfsclient/nfsstats.h
@@ -40,7 +40,7 @@
#ifndef _NFS_NFS_H_
#define _NFS_NFS_H_
-#ifdef KERNEL
+#ifdef _KERNEL
#include "opt_nfs.h"
#endif
@@ -83,7 +83,7 @@
#define NFS_GATHERDELAY 10 /* Default write gather delay (msec) */
#endif
#define NFS_DIRBLKSIZ 4096 /* Must be a multiple of DIRBLKSIZ */
-#ifdef KERNEL
+#ifdef _KERNEL
#define DIRBLKSIZ 512 /* XXX we used to use ufs's DIRBLKSIZ */
#endif
@@ -299,7 +299,7 @@ struct nfsstats {
{ "nfsprivport", CTLTYPE_INT }, \
}
-#ifdef KERNEL
+#ifdef _KERNEL
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_NFSREQ);
@@ -734,6 +734,6 @@ int nfsrv_write __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
struct proc *procp, struct mbuf **mrq));
void nfsrv_rcv __P((struct socket *so, void *arg, int waitflag));
void nfsrv_slpderef __P((struct nfssvc_sock *slp));
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif
diff --git a/sys/nfsserver/nfs.h b/sys/nfsserver/nfs.h
index 75a3982..2d009a1 100644
--- a/sys/nfsserver/nfs.h
+++ b/sys/nfsserver/nfs.h
@@ -40,7 +40,7 @@
#ifndef _NFS_NFS_H_
#define _NFS_NFS_H_
-#ifdef KERNEL
+#ifdef _KERNEL
#include "opt_nfs.h"
#endif
@@ -83,7 +83,7 @@
#define NFS_GATHERDELAY 10 /* Default write gather delay (msec) */
#endif
#define NFS_DIRBLKSIZ 4096 /* Must be a multiple of DIRBLKSIZ */
-#ifdef KERNEL
+#ifdef _KERNEL
#define DIRBLKSIZ 512 /* XXX we used to use ufs's DIRBLKSIZ */
#endif
@@ -299,7 +299,7 @@ struct nfsstats {
{ "nfsprivport", CTLTYPE_INT }, \
}
-#ifdef KERNEL
+#ifdef _KERNEL
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_NFSREQ);
@@ -734,6 +734,6 @@ int nfsrv_write __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
struct proc *procp, struct mbuf **mrq));
void nfsrv_rcv __P((struct socket *so, void *arg, int waitflag));
void nfsrv_slpderef __P((struct nfssvc_sock *slp));
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif
diff --git a/sys/nfsserver/nfsrvstats.h b/sys/nfsserver/nfsrvstats.h
index 75a3982..2d009a1 100644
--- a/sys/nfsserver/nfsrvstats.h
+++ b/sys/nfsserver/nfsrvstats.h
@@ -40,7 +40,7 @@
#ifndef _NFS_NFS_H_
#define _NFS_NFS_H_
-#ifdef KERNEL
+#ifdef _KERNEL
#include "opt_nfs.h"
#endif
@@ -83,7 +83,7 @@
#define NFS_GATHERDELAY 10 /* Default write gather delay (msec) */
#endif
#define NFS_DIRBLKSIZ 4096 /* Must be a multiple of DIRBLKSIZ */
-#ifdef KERNEL
+#ifdef _KERNEL
#define DIRBLKSIZ 512 /* XXX we used to use ufs's DIRBLKSIZ */
#endif
@@ -299,7 +299,7 @@ struct nfsstats {
{ "nfsprivport", CTLTYPE_INT }, \
}
-#ifdef KERNEL
+#ifdef _KERNEL
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_NFSREQ);
@@ -734,6 +734,6 @@ int nfsrv_write __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
struct proc *procp, struct mbuf **mrq));
void nfsrv_rcv __P((struct socket *so, void *arg, int waitflag));
void nfsrv_slpderef __P((struct nfssvc_sock *slp));
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif
diff --git a/sys/nwfs/nwfs.h b/sys/nwfs/nwfs.h
index 51ae76b..e547869 100644
--- a/sys/nwfs/nwfs.h
+++ b/sys/nwfs/nwfs.h
@@ -49,7 +49,7 @@
#define NWFSIOC_GETEINFO _IOR('n',2,struct nw_entry_info)
#define NWFSIOC_GETNS _IOR('n',3,int)
-#ifdef KERNEL
+#ifdef _KERNEL
#include <sys/vnode.h>
#include <sys/mount.h>
@@ -78,6 +78,6 @@ int nwfs_ioctl(struct vop_ioctl_args *ap);
int nwfs_doio(struct buf *bp, struct ucred *cr, struct proc *p);
int nwfs_vinvalbuf(struct vnode *vp, int flags, struct ucred *cred,
struct proc *p, int intrflg);
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* _NWFS_H_ */
diff --git a/sys/nwfs/nwfs_mount.h b/sys/nwfs/nwfs_mount.h
index 02702ed..613e685 100644
--- a/sys/nwfs/nwfs_mount.h
+++ b/sys/nwfs/nwfs_mount.h
@@ -70,11 +70,11 @@ struct nwfs_args {
struct ncp_nlstables nls;
};
-#ifdef KERNEL
+#ifdef _KERNEL
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_NWFSMNT);
#endif
-#endif /* KERNEL */
+#endif
#endif /* !_NWFS_MOUNT_H_ */
diff --git a/sys/pc98/pc98/pc98_machdep.h b/sys/pc98/pc98/pc98_machdep.h
index dfadc2d..b2457c1 100644
--- a/sys/pc98/pc98/pc98_machdep.h
+++ b/sys/pc98/pc98/pc98_machdep.h
@@ -23,6 +23,8 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
*/
#ifndef __PC98_PC98_PC98_MACHDEP_H__
@@ -40,7 +42,7 @@ int scsi_da_bios_params __P((struct ccb_calc_geometry *));
#define PC98_SAVE_AREA(highreso_flag) (0xa1000)
#define PC98_SAVE_AREA_ADDRESS (0x10)
-#if defined(KERNEL) && !defined(LOCORE)
+#if defined(_KERNEL) && !defined(LOCORE)
/* BIOS parameter block */
extern unsigned char pc98_system_parameter[]; /* in locore.c */
#define OFS_BOOT_boothowto 0x210
@@ -70,6 +72,6 @@ extern unsigned char pc98_system_parameter[]; /* in locore.c */
# define PC98_TYPE_CHECK(x) ((pc98_machine_type & (x)) == (x))
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* __PC98_PC98_PC98_MACHDEP_H__ */
diff --git a/sys/pccard/cardinfo.h b/sys/pccard/cardinfo.h
index 599188a..425810b 100644
--- a/sys/pccard/cardinfo.h
+++ b/sys/pccard/cardinfo.h
@@ -33,7 +33,7 @@
#ifndef _PCCARD_CARDINFO_H_
#define _PCCARD_CARDINFO_H_
-#ifndef KERNEL
+#ifndef _KERNEL
#include <sys/types.h>
#endif
#include <sys/ioccom.h>
diff --git a/sys/pci/if_mn.c b/sys/pci/if_mn.c
index 243d2ff..ce4e3e6 100644
--- a/sys/pci/if_mn.c
+++ b/sys/pci/if_mn.c
@@ -47,7 +47,7 @@ struct mn_control {
unsigned ts[M32_CHAN];
};
-#ifdef KERNEL
+#ifdef _KERNEL
#define PPP_HEADER_LEN 4 /* XXX: should live in some header somewhere */
#include <sys/param.h>
@@ -1287,4 +1287,4 @@ mn_attach (pcici_t tag, int unit)
return;
}
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index 7cc760f..26de939 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -46,9 +46,9 @@
#define NCR_GETCC_WITHMSG
-#if defined (__FreeBSD__) && defined(KERNEL)
+#if defined (__FreeBSD__) && defined(_KERNEL)
#include "opt_ncr.h"
-#endif /* defined(KERNEL) */
+#endif
/*==========================================================
**
@@ -175,7 +175,7 @@
#include <sys/param.h>
#include <sys/time.h>
-#ifdef KERNEL
+#ifdef _KERNEL
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/buf.h>
@@ -186,7 +186,7 @@
#include <vm/vm.h>
#include <vm/pmap.h>
#include <vm/vm_extern.h>
-#endif /* KERNEL */
+#endif
#include <pci/pcivar.h>
#include <pci/pcireg.h>
@@ -1304,7 +1304,7 @@ struct scripth {
**==========================================================
*/
-#ifdef KERNEL
+#ifdef _KERNEL
static nccb_p ncr_alloc_nccb (ncb_p np, u_long target, u_long lun);
static void ncr_complete (ncb_p np, nccb_p cp);
static int ncr_delta (int * from, int * to);
@@ -1346,7 +1346,7 @@ static void ncr_wakeup (ncb_p np, u_long code);
static const char* ncr_probe (pcici_t tag, pcidi_t type);
static void ncr_attach (pcici_t tag, int unit);
-#endif /* KERNEL */
+#endif /* _KERNEL */
/*==========================================================
**
@@ -1369,7 +1369,7 @@ static const u_long ncr_version = NCR_VERSION * 11
+ (u_long) sizeof (struct lcb) * 3
+ (u_long) sizeof (struct tcb) * 2;
-#ifdef KERNEL
+#ifdef _KERNEL
static const int nncr=MAX_UNITS; /* XXX to be replaced by SYSCTL */
static ncb_p ncrp [MAX_UNITS]; /* XXX to be replaced by SYSCTL */
@@ -7198,4 +7198,4 @@ printf ("Sum = %04x\n", sum);
#endif /* NCR_TEKRAM_EEPROM */
/*=========================================================================*/
-#endif /* KERNEL */
+#endif /* _KERNEL */
diff --git a/sys/posix4/aio.h b/sys/posix4/aio.h
index b96e9eb..32705f9 100644
--- a/sys/posix4/aio.h
+++ b/sys/posix4/aio.h
@@ -44,7 +44,7 @@
/* For struct sigevent:
*/
-#ifdef KERNEL
+#ifdef _KERNEL
#include <sys/signal.h>
#else
#include <signal.h>
@@ -87,7 +87,7 @@ struct aiocb {
int aio_lio_opcode; /* Operation to be performed */
};
-#ifndef KERNEL
+#ifndef _KERNEL
#include <sys/cdefs.h>
__BEGIN_DECLS
@@ -105,6 +105,6 @@ int aio_suspend __P((caio_listio_ctl[], int, const struct timespec *));
int aio_fsync __P((int, struct aiocb *));
__END_DECLS
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* _P1003_1B_AIO_H_ */
diff --git a/sys/posix4/mqueue.h b/sys/posix4/mqueue.h
index c59a4aa..c2fc38e 100644
--- a/sys/posix4/mqueue.h
+++ b/sys/posix4/mqueue.h
@@ -34,6 +34,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
+ * $FreeBSD$
*/
#include <sys/_posix.h>
@@ -56,7 +57,7 @@ struct mq_attr {
long mq_curmsgs; /* number of messages currently queued */
};
-#ifndef KERNEL
+#ifndef _KERNEL
#include <sys/cdefs.h>
@@ -71,6 +72,6 @@ int mq_setattr __P((mqd_t, const struct mq_attr *, struct mq_attr *));
int mq_getattr __P((mqd_t, struct mq_attr *));
__END_DECLS
-#endif /* KERNEL */
+#endif
#endif /* _MQUEUE_H_ */
diff --git a/sys/posix4/sched.h b/sys/posix4/sched.h
index 374c244..bdfc49b 100644
--- a/sys/posix4/sched.h
+++ b/sys/posix4/sched.h
@@ -35,11 +35,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
+ * $FreeBSD$
*/
#include <sys/types.h> /* For pid_t */
-#ifndef KERNEL
+#ifndef _KERNEL
#include <time.h> /* Per P1003.4 */
#endif
@@ -54,7 +55,7 @@ struct sched_param
int sched_priority;
};
-#ifndef KERNEL
+#ifndef _KERNEL
#include <sys/cdefs.h>
__BEGIN_DECLS
@@ -70,6 +71,6 @@ int sched_get_priority_min __P((int));
int sched_rr_get_interval __P((pid_t, struct timespec *));
__END_DECLS
-#endif /* KERNEL */
+#endif
#endif /* _SCHED_H_ */
diff --git a/sys/posix4/semaphore.h b/sys/posix4/semaphore.h
index f57a96f..e97abee 100644
--- a/sys/posix4/semaphore.h
+++ b/sys/posix4/semaphore.h
@@ -34,6 +34,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
+ * $FreeBSD$
*/
#include <sys/_posix.h>
@@ -45,7 +46,7 @@
typedef int sem_t;
-#ifndef KERNEL
+#ifndef _KERNEL
#include <sys/cdefs.h>
__BEGIN_DECLS
@@ -60,6 +61,6 @@ int sem_post __P((sem_t *));
int sem_getvalue __P((sem_t *, int *));
__END_DECLS
-#endif /* KERNEL */
+#endif
#endif /* _SEMAPHORE_H_ */
diff --git a/sys/sys/semaphore.h b/sys/sys/semaphore.h
index f57a96f..e97abee 100644
--- a/sys/sys/semaphore.h
+++ b/sys/sys/semaphore.h
@@ -34,6 +34,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
+ * $FreeBSD$
*/
#include <sys/_posix.h>
@@ -45,7 +46,7 @@
typedef int sem_t;
-#ifndef KERNEL
+#ifndef _KERNEL
#include <sys/cdefs.h>
__BEGIN_DECLS
@@ -60,6 +61,6 @@ int sem_post __P((sem_t *));
int sem_getvalue __P((sem_t *, int *));
__END_DECLS
-#endif /* KERNEL */
+#endif
#endif /* _SEMAPHORE_H_ */
diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index f005c71..ee3173a 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -37,7 +37,7 @@
#include <sys/param.h>
#include <ufs/ffs/fs.h>
-#ifndef KERNEL
+#ifndef _KERNEL
#include <ufs/ufs/dinode.h>
#else
#include "opt_ddb.h"
diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h
index 78fbc0a..83960b0 100644
--- a/sys/ufs/ufs/inode.h
+++ b/sys/ufs/ufs/inode.h
@@ -130,7 +130,7 @@ struct inode {
#define IN_HASHED 0x0080 /* Inode is on hash list */
#define IN_LAZYMOD 0x0100 /* Modified, but don't write yet. */
-#ifdef KERNEL
+#ifdef _KERNEL
/*
* Structure used to pass around logical block paths generated by
* ufs_getlbns and used by truncate and bmap code.
@@ -156,6 +156,6 @@ struct ufid {
ino_t ufid_ino; /* File number (ino). */
int32_t ufid_gen; /* Generation number. */
};
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* !_UFS_UFS_INODE_H_ */
diff --git a/sys/ufs/ufs/quota.h b/sys/ufs/ufs/quota.h
index f449a1a..f8299ee 100644
--- a/sys/ufs/ufs/quota.h
+++ b/sys/ufs/ufs/quota.h
@@ -108,7 +108,7 @@ struct dqblk {
time_t dqb_itime; /* time limit for excessive files */
};
-#ifdef KERNEL
+#ifdef _KERNEL
#include <sys/queue.h>
@@ -191,7 +191,7 @@ int setquota __P((struct mount *, u_long, int, caddr_t));
int setuse __P((struct mount *, u_long, int, caddr_t));
int ufs_quotactl __P((struct mount *, int, uid_t, caddr_t, struct proc *));
-#else /* !KERNEL */
+#else /* !_KERNEL */
#include <sys/cdefs.h>
@@ -199,6 +199,6 @@ __BEGIN_DECLS
int quotactl __P((const char *, int, int, void *));
__END_DECLS
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* !_UFS_UFS_QUOTA_H_ */
diff --git a/sys/ufs/ufs/ufsmount.h b/sys/ufs/ufs/ufsmount.h
index 05f19da..0652545 100644
--- a/sys/ufs/ufs/ufsmount.h
+++ b/sys/ufs/ufs/ufsmount.h
@@ -55,7 +55,7 @@ struct mfs_args {
u_long size; /* size of file system */
};
-#ifdef KERNEL
+#ifdef _KERNEL
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_UFSMNT);
@@ -125,6 +125,6 @@ struct ufsmount {
#define MNINDIR(ump) ((ump)->um_nindir)
#define blkptrtodb(ump, b) ((b) << (ump)->um_bptrtodb)
#define is_sequential(ump, a, b) ((b) == (a) + ump->um_seqinc)
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif
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));
OpenPOWER on IntegriCloud