use _KERNEL_OPT

2001-05-30 11:57:16 +00:00 · 2001-05-30 11:57:16 +00:00 · 67afbd6270
parent 09cf52ad81
commit 67afbd6270
130 changed files with 286 additions and 286 deletions
--- a/sys/altq/altqconf.h
+++ b/sys/altq/altqconf.h
@ -1,6 +1,6 @@
-/*	$NetBSD: altqconf.h,v 1.1 2000/12/14 23:50:43 thorpej Exp $	*/
+/*	$NetBSD: altqconf.h,v 1.2 2001/05/30 11:57:16 mrg Exp $	*/

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_altq_enabled.h"

 #include <sys/conf.h>
@ -14,4 +14,4 @@
 cdev_decl(altq);

 #define	cdev_altq_init(x,y)	cdev__oci_init(x,y)
-#endif /* _KERNEL && ! _LKM */
+#endif /* _KERNEL_OPT */
--- a/sys/arch/algor/include/cpu.h
+++ b/sys/arch/algor/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.1 2001/05/28 16:22:17 thorpej Exp $	*/
+/*	$NetBSD: cpu.h,v 1.2 2001/05/30 12:28:37 mrg Exp $	*/

 #ifndef _ALGOR_CPU_H_
 #define _ALGOR_CPU_H_
@ -7,7 +7,7 @@
 #include <mips/cpuregs.h>

 #ifndef _LOCORE
-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif

--- a/sys/arch/algor/include/param.h
+++ b/sys/arch/algor/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.1 2001/05/28 16:22:19 thorpej Exp $	*/
+/*	$NetBSD: param.h,v 1.2 2001/05/30 12:28:38 mrg Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -82,9 +82,9 @@
 #define	MCLBYTES	(1 << MCLSHIFT)	/* size of a m_buf cluster */
 #define	MCLOFSET	(MCLBYTES - 1)

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_gateway.h"
-#endif /* _KERNEL && ! _LKM */
+#endif

 #ifndef NMBCLUSTERS
 #ifdef GATEWAY
--- a/sys/arch/alpha/alpha/linux_syscall.c
+++ b/sys/arch/alpha/alpha/linux_syscall.c
@ -1,4 +1,4 @@
-/* $NetBSD: linux_syscall.c,v 1.4 2001/01/03 22:15:38 thorpej Exp $ */
+/* $NetBSD: linux_syscall.c,v 1.5 2001/05/30 12:28:38 mrg Exp $ */

 /*-
 * Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -94,14 +94,14 @@
 * rights to redistribute these changes.
 */

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_syscall_debug.h"
 #include "opt_ktrace.h"
 #endif

 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */

-__KERNEL_RCSID(0, "$NetBSD: linux_syscall.c,v 1.4 2001/01/03 22:15:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscall.c,v 1.5 2001/05/30 12:28:38 mrg Exp $");

 #include <sys/param.h>
 #include <sys/systm.h>
--- a/sys/arch/alpha/alpha/osf1_syscall.c
+++ b/sys/arch/alpha/alpha/osf1_syscall.c
@ -1,4 +1,4 @@
-/* $NetBSD: osf1_syscall.c,v 1.4 2001/01/03 22:15:38 thorpej Exp $ */
+/* $NetBSD: osf1_syscall.c,v 1.5 2001/05/30 12:28:38 mrg Exp $ */

 /*-
 * Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -94,14 +94,14 @@
 * rights to redistribute these changes.
 */

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_syscall_debug.h"
 #include "opt_ktrace.h"
 #endif

 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */

-__KERNEL_RCSID(0, "$NetBSD: osf1_syscall.c,v 1.4 2001/01/03 22:15:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osf1_syscall.c,v 1.5 2001/05/30 12:28:38 mrg Exp $");

 #include <sys/param.h>
 #include <sys/systm.h>
--- a/sys/arch/alpha/include/cpu.h
+++ b/sys/arch/alpha/include/cpu.h
@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.57 2001/05/27 13:53:25 sommerfeld Exp $ */
+/* $NetBSD: cpu.h,v 1.58 2001/05/30 12:28:38 mrg Exp $ */

 /*-
 * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@ -82,7 +82,7 @@
 #ifndef _ALPHA_CPU_H_
 #define _ALPHA_CPU_H_

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_multiprocessor.h"
 #include "opt_lockdebug.h"
 #endif
--- a/sys/arch/alpha/include/param.h
+++ b/sys/arch/alpha/include/param.h
@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.30 2000/06/09 16:03:04 thorpej Exp $ */
+/* $NetBSD: param.h,v 1.31 2001/05/30 12:28:38 mrg Exp $ */

 /*
 * Copyright (c) 1988 University of Utah.
@ -108,9 +108,9 @@
 #define	MCLOFSET	(MCLBYTES - 1)
 #ifndef NMBCLUSTERS

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_gateway.h"
-#endif /* _KERNEL && ! _LKM */
+#endif

 #ifdef GATEWAY
 #define	NMBCLUSTERS	512		/* map size, max cluster allocation */
--- a/sys/arch/alpha/include/pmap.h
+++ b/sys/arch/alpha/include/pmap.h
@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.50 2001/05/26 21:27:03 chs Exp $ */
+/* $NetBSD: pmap.h,v 1.51 2001/05/30 12:28:38 mrg Exp $ */

 /*-
 * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@ -80,7 +80,7 @@
 #ifndef	_PMAP_MACHINE_
 #define	_PMAP_MACHINE_

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_multiprocessor.h"
 #endif

--- a/sys/arch/amiga/dev/if_le.c
+++ b/sys/arch/amiga/dev/if_le.c
@ -1,4 +1,4 @@
-/*	$NetBSD: if_le.c,v 1.32 1999/01/10 12:56:25 tron Exp $	*/
+/*	$NetBSD: if_le.c,v 1.33 2001/05/30 12:28:39 mrg Exp $	*/

 /*-
 * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -118,7 +118,7 @@ struct cfattach le_zbus_ca = {
 	sizeof(struct le_softc), le_zbus_match, le_zbus_attach
 };

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_ddb.h"
 #endif

--- a/sys/arch/amiga/include/cpu.h
+++ b/sys/arch/amiga/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.51 2000/12/19 21:09:55 scw Exp $	*/
+/*	$NetBSD: cpu.h,v 1.52 2001/05/30 12:28:39 mrg Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -48,7 +48,7 @@
 * Exported definitions unique to amiga/68k cpu support.
 */

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif

--- a/sys/arch/amigappc/include/cpu.h
+++ b/sys/arch/amigappc/include/cpu.h
@ -1,4 +1,4 @@
-/*      $NetBSD: cpu.h,v 1.6 2001/02/18 19:08:16 is Exp $ */
+/*      $NetBSD: cpu.h,v 1.7 2001/05/30 12:28:39 mrg Exp $ */

 /*
 * Copyright (C) 1995-1997 Wolfgang Solfrank.
@ -33,7 +33,7 @@
 #ifndef _MACHINE_CPU_H_
 #define _MACHINE_CPU_H_

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif

--- a/sys/arch/amigappc/include/param.h
+++ b/sys/arch/amigappc/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.2 2000/06/30 17:55:11 itojun Exp $	*/
+/*	$NetBSD: param.h,v 1.3 2001/05/30 12:28:39 mrg Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -93,9 +93,9 @@

 #ifndef NMBCLUSTERS

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_gateway.h"
-#endif /* _KERNEL && ! _LKM */
+#endif

 #ifdef GATEWAY
 #define	NMBCLUSTERS	512		/* map size, max cluster allocation */
--- a/sys/arch/arc/include/cpu.h
+++ b/sys/arch/arc/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.15 2000/05/26 21:19:29 thorpej Exp $	*/
+/*	$NetBSD: cpu.h,v 1.16 2001/05/30 12:28:39 mrg Exp $	*/
 /*	$OpenBSD: cpu.h,v 1.9 1998/01/28 13:46:10 pefo Exp $ */

 #ifndef _ARC_CPU_H_
@ -13,7 +13,7 @@
 #include <mips/cpuregs.h>

 #ifndef _LOCORE
-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif

--- a/sys/arch/arc/include/param.h
+++ b/sys/arch/arc/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.14 2000/06/30 17:55:12 itojun Exp $	*/
+/*	$NetBSD: param.h,v 1.15 2001/05/30 12:28:39 mrg Exp $	*/
 /*      $OpenBSD: param.h,v 1.9 1997/04/30 09:54:15 niklas Exp $ */

 /*
@ -98,9 +98,9 @@
 #define	MCLOFSET	(MCLBYTES - 1)
 #ifndef NMBCLUSTERS

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_gateway.h"
-#endif /* _KERNEL && ! _LKM */
+#endif

 #ifdef GATEWAY
 #define	NMBCLUSTERS	2048		/* map size, max cluster allocation */
--- a/sys/arch/arm/include/arm32/param.h
+++ b/sys/arch/arm/include/arm32/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.3 2001/03/04 08:28:51 matt Exp $	*/
+/*	$NetBSD: param.h,v 1.4 2001/05/30 12:28:40 mrg Exp $	*/

 /*
 * Copyright (c) 1994,1995 Mark Brinicombe.
@ -95,9 +95,9 @@

 #ifndef NMBCLUSTERS

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_gateway.h"
-#endif /* _KERNEL && ! _LKM */
+#endif

 #ifdef GATEWAY
 #define	NMBCLUSTERS	512		/* map size, max cluster allocation */
--- a/sys/arch/arm/include/ofisa_machdep.h
+++ b/sys/arch/arm/include/ofisa_machdep.h
@ -1,4 +1,4 @@
-/*	$NetBSD: ofisa_machdep.h,v 1.1 2001/02/23 21:23:48 reinoud Exp $	*/
+/*	$NetBSD: ofisa_machdep.h,v 1.2 2001/05/30 12:28:40 mrg Exp $	*/

 /*
 * Copyright 1998
@ -36,7 +36,7 @@
 int	ofisa_get_isabus_data(int, struct isabus_attach_args *);
 int	ofisa_ignore_child(int pphandle, int cphandle);

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_compat_old_ofw.h"
 #endif

--- a/sys/arch/arm32/include/irqhandler.h
+++ b/sys/arch/arm32/include/irqhandler.h
@ -1,4 +1,4 @@
-/*	$NetBSD: irqhandler.h,v 1.16 1998/09/08 03:10:07 mark Exp $	*/
+/*	$NetBSD: irqhandler.h,v 1.17 2001/05/30 12:28:40 mrg Exp $	*/

 /*
 * Copyright (c) 1994-1996 Mark Brinicombe.
@ -43,7 +43,7 @@
 #ifndef _ARM32_IRQHANDLER_H_
 #define _ARM32_IRQHANDLER_H_

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_cputypes.h"
 #endif

--- a/sys/arch/arm32/include/vidc.h
+++ b/sys/arch/arm32/include/vidc.h
@ -1,4 +1,4 @@
-/*	$NetBSD: vidc.h,v 1.11 2001/03/20 12:52:03 reinoud Exp $	*/
+/*	$NetBSD: vidc.h,v 1.12 2001/05/30 12:28:40 mrg Exp $	*/

 /*
 * Copyright (c) 1994,1995 Mark Brinicombe.
@ -55,7 +55,7 @@
 #ifndef	_ARM32_VIDC_H_
 #define	_ARM32_VIDC_H_

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_cputypes.h"
 #endif

--- a/sys/arch/atari/include/cpu.h
+++ b/sys/arch/atari/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.36 2001/01/07 21:08:03 leo Exp $	*/
+/*	$NetBSD: cpu.h,v 1.37 2001/05/30 12:28:40 mrg Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -49,7 +49,7 @@
 * Exported definitions unique to atari/68k cpu support.
 */

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif

--- a/sys/arch/atari/vme/if_le_vme.c
+++ b/sys/arch/atari/vme/if_le_vme.c
@ -1,4 +1,4 @@
-/*	$NetBSD: if_le_vme.c,v 1.11 1999/10/25 14:52:55 leo Exp $	*/
+/*	$NetBSD: if_le_vme.c,v 1.12 2001/05/30 12:28:41 mrg Exp $	*/

 /*-
 * Copyright (c) 1998 maximum entropy.  All rights reserved.
@ -125,7 +125,7 @@ struct cfattach le_vme_ca = {
 	sizeof(struct le_softc), le_vme_match, le_vme_attach
 };

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_ddb.h"
 #endif

--- a/sys/arch/bebox/include/cpu.h
+++ b/sys/arch/bebox/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.9 2000/12/14 10:33:42 mycroft Exp $	*/
+/*	$NetBSD: cpu.h,v 1.10 2001/05/30 12:28:41 mrg Exp $	*/

 /*
 * Copyright (C) 1995-1997 Wolfgang Solfrank.
@ -33,7 +33,7 @@
 #ifndef	_MACHINE_CPU_H_
 #define	_MACHINE_CPU_H_

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif

--- a/sys/arch/bebox/include/param.h
+++ b/sys/arch/bebox/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.7 2000/06/30 17:55:13 itojun Exp $	*/
+/*	$NetBSD: param.h,v 1.8 2001/05/30 12:28:41 mrg Exp $	*/

 /*-
 * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -81,9 +81,9 @@

 #ifndef NMBCLUSTERS

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_gateway.h"
-#endif /* _KERNEL && ! _LKM */
+#endif

 #ifdef GATEWAY
 #define	NMBCLUSTERS	512		/* map size, max cluster allocation */
--- a/sys/arch/cesfic/include/cpu.h
+++ b/sys/arch/cesfic/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.1 2001/05/14 18:23:10 drochner Exp $	*/
+/*	$NetBSD: cpu.h,v 1.2 2001/05/30 12:28:41 mrg Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -45,7 +45,7 @@
 #ifndef _MACHINE_CPU_H_
 #define	_MACHINE_CPU_H_

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif

--- a/sys/arch/cobalt/include/cpu.h
+++ b/sys/arch/cobalt/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.7 2000/05/27 02:14:22 soren Exp $	*/
+/*	$NetBSD: cpu.h,v 1.8 2001/05/30 12:28:41 mrg Exp $	*/

 #ifndef _COBALT_CPU_H
 #define _COBALT_CPU_H
@ -7,7 +7,7 @@
 #include <mips/cpuregs.h>

 #ifndef _LOCORE
-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif

--- a/sys/arch/cobalt/include/param.h
+++ b/sys/arch/cobalt/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.5 2000/06/30 17:55:13 itojun Exp $	*/
+/*	$NetBSD: param.h,v 1.6 2001/05/30 12:28:41 mrg Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -63,9 +63,9 @@
 #define	MCLBYTES	(1 << MCLSHIFT)	/* Size of a m_buf cluster */
 #define	MCLOFSET	(MCLBYTES - 1)

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_gateway.h"
-#endif /* _KERNEL && ! _LKM */
+#endif

 #ifndef NMBCLUSTERS
 #ifdef GATEWAY
--- a/sys/arch/dnard/include/irqhandler.h
+++ b/sys/arch/dnard/include/irqhandler.h
@ -1,4 +1,4 @@
-/*	$NetBSD: irqhandler.h,v 1.1 2001/05/09 15:40:55 matt Exp $	*/
+/*	$NetBSD: irqhandler.h,v 1.2 2001/05/30 12:28:41 mrg Exp $	*/

 /*
 * Copyright (c) 1994-1996 Mark Brinicombe.
@ -43,7 +43,7 @@
 #ifndef _ARM32_IRQHANDLER_H_
 #define _ARM32_IRQHANDLER_H_

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_cputypes.h"
 #endif

--- a/sys/arch/hp300/dev/if_le.c
+++ b/sys/arch/hp300/dev/if_le.c
@ -1,4 +1,4 @@
-/*	$NetBSD: if_le.c,v 1.47 1998/08/15 10:51:16 mycroft Exp $	*/
+/*	$NetBSD: if_le.c,v 1.48 2001/05/30 12:28:42 mrg Exp $	*/

 /*-
 * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -123,7 +123,7 @@ struct cfattach le_ca = {

 int	leintr __P((void *));

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_ddb.h"
 #endif

--- a/sys/arch/hp300/include/cpu.h
+++ b/sys/arch/hp300/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.37 2000/12/19 21:09:56 scw Exp $	*/
+/*	$NetBSD: cpu.h,v 1.38 2001/05/30 12:28:42 mrg Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -45,7 +45,7 @@
 #ifndef _HP300_CPU_H_
 #define	_HP300_CPU_H_

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif

--- a/sys/arch/hp300/include/hp300spu.h
+++ b/sys/arch/hp300/include/hp300spu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: hp300spu.h,v 1.6 2000/11/29 21:51:49 jdolecek Exp $	*/
+/*	$NetBSD: hp300spu.h,v 1.7 2001/05/30 12:28:42 mrg Exp $	*/

 /*-
 * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -88,7 +88,7 @@ extern	int mmuid;		/* MMU id */
 /*
 * Pull in user-defined SPU configuration options.
 */
-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_spuconf.h"
 #endif

--- a/sys/arch/hp300/include/param.h
+++ b/sys/arch/hp300/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.40 2000/02/11 19:25:15 thorpej Exp $	*/
+/*	$NetBSD: param.h,v 1.41 2001/05/30 12:28:42 mrg Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -83,7 +83,7 @@
 void	_delay __P((u_int));
 #endif /* _KERNEL && !_LOCORE */

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_compat_hpux.h"
 #endif

--- a/sys/arch/hpc/hpc/platid.h
+++ b/sys/arch/hpc/hpc/platid.h
@ -1,4 +1,4 @@
-/*	$NetBSD: platid.h,v 1.4 2001/05/12 10:17:20 takemura Exp $	*/
+/*	$NetBSD: platid.h,v 1.5 2001/05/30 12:28:42 mrg Exp $	*/

 /*-
 * Copyright (c) 1999-2001
@ -146,7 +146,7 @@ tchar* platid_name(platid_t *);
 struct platid_data *platid_search(platid_t *, struct platid_data *);
 __END_DECLS

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_spec_platform.h"
 #endif
 #include <machine/platid_generated.h>
--- a/sys/arch/hpcarm/include/irqhandler.h
+++ b/sys/arch/hpcarm/include/irqhandler.h
@ -1,4 +1,4 @@
-/*	$NetBSD: irqhandler.h,v 1.2 2001/05/15 16:15:22 toshii Exp $	*/
+/*	$NetBSD: irqhandler.h,v 1.3 2001/05/30 12:28:43 mrg Exp $	*/

 /*
 * Copyright (c) 1994-1996 Mark Brinicombe.
@ -43,7 +43,7 @@
 #ifndef _HPCARM_IRQHANDLER_H_
 #define _HPCARM_IRQHANDLER_H_

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_cputypes.h"
 #endif

--- a/sys/arch/hpcmips/include/cpu.h
+++ b/sys/arch/hpcmips/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.7 2000/05/26 21:19:43 thorpej Exp $	*/
+/*	$NetBSD: cpu.h,v 1.8 2001/05/30 12:28:43 mrg Exp $	*/

 #ifndef __HPCMIPS_CPU_H
 #define __HPCMIPS_CPU_H
@ -7,7 +7,7 @@
 #include <mips/cpuregs.h>

 #ifndef _LOCORE
-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif

--- a/sys/arch/hpcmips/include/param.h
+++ b/sys/arch/hpcmips/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.3 2000/06/30 17:55:14 itojun Exp $	*/
+/*	$NetBSD: param.h,v 1.4 2001/05/30 12:28:43 mrg Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -89,9 +89,9 @@

 #ifndef NMBCLUSTERS

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_gateway.h"
-#endif /* _KERNEL && ! _LKM */
+#endif

 #ifdef GATEWAY
 #define	NMBCLUSTERS	2048		/* map size, max cluster allocation */
--- a/sys/arch/i386/i386/freebsd_machdep.c
+++ b/sys/arch/i386/i386/freebsd_machdep.c
@ -1,4 +1,4 @@
-/*	$NetBSD: freebsd_machdep.c,v 1.26 2000/12/22 22:58:53 jdolecek Exp $	*/
+/*	$NetBSD: freebsd_machdep.c,v 1.27 2001/05/30 12:28:43 mrg Exp $	*/

 /*-
 * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@ -36,7 +36,7 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_vm86.h"
 #endif

--- a/sys/arch/i386/i386/freebsd_syscall.c
+++ b/sys/arch/i386/i386/freebsd_syscall.c
@ -1,4 +1,4 @@
-/*	$NetBSD: freebsd_syscall.c,v 1.5 2000/12/27 23:20:29 jdolecek Exp $	*/
+/*	$NetBSD: freebsd_syscall.c,v 1.6 2001/05/30 12:28:43 mrg Exp $	*/

 /*-
 * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@ -36,7 +36,7 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_syscall_debug.h"
 #include "opt_ktrace.h"
 #endif
--- a/sys/arch/i386/i386/ibcs2_machdep.c
+++ b/sys/arch/i386/i386/ibcs2_machdep.c
@ -1,4 +1,4 @@
-/*	$NetBSD: ibcs2_machdep.c,v 1.13 2000/12/22 22:58:53 jdolecek Exp $	*/
+/*	$NetBSD: ibcs2_machdep.c,v 1.14 2001/05/30 12:28:43 mrg Exp $	*/

 /*-
 * Copyright (c) 1997, 2000 The NetBSD Foundation, Inc.
@ -36,7 +36,7 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_vm86.h"
 #endif

--- a/sys/arch/i386/i386/ibcs2_sigcode.s
+++ b/sys/arch/i386/i386/ibcs2_sigcode.s
@ -1,4 +1,4 @@
-/*	$NetBSD: ibcs2_sigcode.s,v 1.2 2001/05/21 06:13:12 perry Exp $	*/
+/*	$NetBSD: ibcs2_sigcode.s,v 1.3 2001/05/30 12:28:43 mrg Exp $	*/

 /*-
 * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -74,7 +74,7 @@
 *	@(#)locore.s	7.3 (Berkeley) 5/13/91
 */

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_vm86.h"
 #endif

--- a/sys/arch/i386/i386/ibcs2_syscall.c
+++ b/sys/arch/i386/i386/ibcs2_syscall.c
@ -1,4 +1,4 @@
-/*	$NetBSD: ibcs2_syscall.c,v 1.14 2000/12/13 01:24:46 mycroft Exp $	*/
+/*	$NetBSD: ibcs2_syscall.c,v 1.15 2001/05/30 12:28:43 mrg Exp $	*/

 /*-
 * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@ -36,7 +36,7 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_syscall_debug.h"
 #include "opt_vm86.h"
 #include "opt_ktrace.h"
--- a/sys/arch/i386/i386/linux_sigcode.s
+++ b/sys/arch/i386/i386/linux_sigcode.s
@ -1,4 +1,4 @@
-/*	$NetBSD: linux_sigcode.s,v 1.2 2001/05/21 06:13:12 perry Exp $	*/
+/*	$NetBSD: linux_sigcode.s,v 1.3 2001/05/30 12:28:43 mrg Exp $	*/

 /*-
 * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -74,7 +74,7 @@
 *	@(#)locore.s	7.3 (Berkeley) 5/13/91
 */

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_vm86.h"
 #endif

--- a/sys/arch/i386/i386/linux_syscall.c
+++ b/sys/arch/i386/i386/linux_syscall.c
@ -1,4 +1,4 @@
-/*	$NetBSD: linux_syscall.c,v 1.15 2000/12/14 18:35:13 mycroft Exp $	*/
+/*	$NetBSD: linux_syscall.c,v 1.16 2001/05/30 12:28:43 mrg Exp $	*/

 /*-
 * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@ -36,7 +36,7 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_syscall_debug.h"
 #include "opt_vm86.h"
 #include "opt_ktrace.h"
--- a/sys/arch/i386/i386/svr4_machdep.c
+++ b/sys/arch/i386/i386/svr4_machdep.c
@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_machdep.c,v 1.51 2001/05/09 20:31:00 kleink Exp $	 */
+/*	$NetBSD: svr4_machdep.c,v 1.52 2001/05/30 12:28:43 mrg Exp $	 */

 /*-
 * Copyright (c) 1994, 2000 The NetBSD Foundation, Inc.
@ -36,7 +36,7 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_vm86.h"
 #include "opt_user_ldt.h"
 #endif
--- a/sys/arch/i386/i386/svr4_sigcode.s
+++ b/sys/arch/i386/i386/svr4_sigcode.s
@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_sigcode.s,v 1.2 2001/05/21 06:13:12 perry Exp $	*/
+/*	$NetBSD: svr4_sigcode.s,v 1.3 2001/05/30 12:28:44 mrg Exp $	*/

 /*-
 * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -74,7 +74,7 @@
 *	@(#)locore.s	7.3 (Berkeley) 5/13/91
 */

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_vm86.h"
 #endif

--- a/sys/arch/i386/i386/svr4_syscall.c
+++ b/sys/arch/i386/i386/svr4_syscall.c
@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_syscall.c,v 1.13 2000/12/13 01:24:46 mycroft Exp $	*/
+/*	$NetBSD: svr4_syscall.c,v 1.14 2001/05/30 12:28:44 mrg Exp $	*/

 /*-
 * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@ -36,7 +36,7 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_syscall_debug.h"
 #include "opt_vm86.h"
 #include "opt_ktrace.h"
--- a/sys/arch/i386/include/byte_swap.h
+++ b/sys/arch/i386/include/byte_swap.h
@ -1,4 +1,4 @@
-/*	$NetBSD: byte_swap.h,v 1.2 2000/03/16 14:15:26 mycroft Exp $	*/
+/*	$NetBSD: byte_swap.h,v 1.3 2001/05/30 12:28:44 mrg Exp $	*/

 /*-
 * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -39,7 +39,7 @@
 #ifndef _I386_BYTE_SWAP_H_
 #define	_I386_BYTE_SWAP_H_

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_cputype.h"
 #endif

--- a/sys/arch/i386/include/cpu.h
+++ b/sys/arch/i386/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.70 2001/05/03 00:35:37 thorpej Exp $	*/
+/*	$NetBSD: cpu.h,v 1.71 2001/05/30 12:28:44 mrg Exp $	*/

 /*-
 * Copyright (c) 1990 The Regents of the University of California.
@ -41,7 +41,7 @@
 #ifndef _I386_CPU_H_
 #define _I386_CPU_H_

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_multiprocessor.h"
 #include "opt_lockdebug.h"
 #endif
--- a/sys/arch/i386/include/param.h
+++ b/sys/arch/i386/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.44 2001/04/02 11:48:18 fvdl Exp $	*/
+/*	$NetBSD: param.h,v 1.45 2001/05/30 12:28:44 mrg Exp $	*/

 /*-
 * Copyright (c) 1990 The Regents of the University of California.
@ -115,9 +115,9 @@

 #ifndef NMBCLUSTERS

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_gateway.h"
-#endif /* _KERNEL && ! _LKM */
+#endif

 #ifdef GATEWAY
 #define	NMBCLUSTERS	2048		/* map size, max cluster allocation */
--- a/sys/arch/i386/include/pmap.h
+++ b/sys/arch/i386/include/pmap.h
@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.57 2001/05/26 16:32:42 chs Exp $	*/
+/*	$NetBSD: pmap.h,v 1.58 2001/05/30 12:28:44 mrg Exp $	*/

 /*
 *
@ -39,7 +39,7 @@
 #ifndef	_I386_PMAP_H_
 #define	_I386_PMAP_H_

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_user_ldt.h"
 #include "opt_largepages.h"
 #endif
--- a/sys/arch/i386/include/psl.h
+++ b/sys/arch/i386/include/psl.h
@ -1,4 +1,4 @@
-/*	$NetBSD: psl.h,v 1.32 1998/01/15 22:26:03 thorpej Exp $	*/
+/*	$NetBSD: psl.h,v 1.33 2001/05/30 12:28:45 mrg Exp $	*/

 /*-
 * Copyright (c) 1990 The Regents of the University of California.
@ -66,7 +66,7 @@
 #define	PSL_MBZ		0xffc08028	/* must be zero bits */

 #define	PSL_USERSET	(PSL_MBO | PSL_I)
-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_vm86.h"
 #endif
 #ifdef VM86
--- a/sys/arch/i386/include/segments.h
+++ b/sys/arch/i386/include/segments.h
@ -1,4 +1,4 @@
-/*	$NetBSD: segments.h,v 1.30 1999/11/12 18:37:29 drochner Exp $	*/
+/*	$NetBSD: segments.h,v 1.31 2001/05/30 12:28:45 mrg Exp $	*/

 /*-
 * Copyright (c) 1995, 1997
@ -63,7 +63,7 @@
 #define	GSEL(s,r)	(((s) << 3) | r)		/* a global selector */
 #define	LSEL(s,r)	(((s) << 3) | r | SEL_LDT)	/* a local selector */

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_vm86.h"
 #endif

--- a/sys/arch/luna68k/include/cpu.h
+++ b/sys/arch/luna68k/include/cpu.h
@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.4 2000/12/19 21:09:56 scw Exp $ */
+/* $NetBSD: cpu.h,v 1.5 2001/05/30 12:28:45 mrg Exp $ */

 /*
 * Copyright (c) 1988 University of Utah.
@ -45,7 +45,7 @@
 #ifndef _MACHINE_CPU_H
 #define _MACHINE_CPU_H

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif

--- a/sys/arch/m68k/include/param.h
+++ b/sys/arch/m68k/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.9 2001/05/03 20:59:55 fredette Exp $	*/
+/*	$NetBSD: param.h,v 1.10 2001/05/30 12:28:45 mrg Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -106,9 +106,9 @@
 #define	MCLOFSET	(MCLBYTES - 1)
 #ifndef NMBCLUSTERS

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_gateway.h"
-#endif /* _KERNEL && ! _LKM */
+#endif

 #ifdef GATEWAY
 # define	NMBCLUSTERS	512	/* map size, max cluster allocation */
--- a/sys/arch/mac68k/include/cpu.h
+++ b/sys/arch/mac68k/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.66 2000/12/19 21:09:56 scw Exp $	*/
+/*	$NetBSD: cpu.h,v 1.67 2001/05/30 12:28:45 mrg Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -68,7 +68,7 @@
 * Exported definitions unique to mac68k/68k cpu support.
 */

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif

--- a/sys/arch/macppc/dev/if_mcvar.h
+++ b/sys/arch/macppc/dev/if_mcvar.h
@ -1,4 +1,4 @@
-/*	$NetBSD: if_mcvar.h,v 1.3 1998/09/03 14:06:07 tsubai Exp $	*/
+/*	$NetBSD: if_mcvar.h,v 1.4 2001/05/30 12:28:45 mrg Exp $	*/

 /*-
 * Copyright (c) 1997 David Huang <khym@bga.com>
@ -25,7 +25,7 @@
 *
 */

-#if defined(_KERNEL)  && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_ddb.h"
 #endif

--- a/sys/arch/macppc/include/cpu.h
+++ b/sys/arch/macppc/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.16 2001/03/22 04:11:46 tsubai Exp $	*/
+/*	$NetBSD: cpu.h,v 1.17 2001/05/30 12:28:46 mrg Exp $	*/

 /*
 * Copyright (C) 1995-1997 Wolfgang Solfrank.
@ -33,7 +33,7 @@
 #ifndef	_MACHINE_CPU_H_
 #define	_MACHINE_CPU_H_

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #include "opt_multiprocessor.h"
 #endif
--- a/sys/arch/macppc/include/param.h
+++ b/sys/arch/macppc/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.10 2000/06/30 17:55:15 itojun Exp $	*/
+/*	$NetBSD: param.h,v 1.11 2001/05/30 12:28:46 mrg Exp $	*/

 /*-
 * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -79,9 +79,9 @@

 #ifndef NMBCLUSTERS

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_gateway.h"
-#endif /* _KERNEL && ! _LKM */
+#endif

 #ifdef GATEWAY
 #define	NMBCLUSTERS	512		/* map size, max cluster allocation */
--- a/sys/arch/mipsco/include/cpu.h
+++ b/sys/arch/mipsco/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.4 2001/03/11 09:20:58 wdk Exp $	*/
+/*	$NetBSD: cpu.h,v 1.5 2001/05/30 12:28:46 mrg Exp $	*/

 #ifndef _MIPSCO_CPU_H_
 #define _MIPSCO_CPU_H_
@ -7,7 +7,7 @@
 #include <mips/cpuregs.h>

 #ifndef _LOCORE
-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif

--- a/sys/arch/mipsco/include/param.h
+++ b/sys/arch/mipsco/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.1 2000/08/12 22:58:30 wdk Exp $	*/
+/*	$NetBSD: param.h,v 1.2 2001/05/30 12:28:46 mrg Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -90,9 +90,9 @@

 #ifndef NMBCLUSTERS

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_gateway.h"
-#endif /* _KERNEL && ! _LKM */
+#endif

 #ifdef GATEWAY
 #define	NMBCLUSTERS	2048		/* map size, max cluster allocation */
--- a/sys/arch/mipsco/obio/if_le.c
+++ b/sys/arch/mipsco/obio/if_le.c
@ -1,4 +1,4 @@
-/*	$NetBSD: if_le.c,v 1.2 2000/08/15 04:56:46 wdk Exp $	*/
+/*	$NetBSD: if_le.c,v 1.3 2001/05/30 12:28:46 mrg Exp $	*/

 /*-
 * Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@ -92,7 +92,7 @@ struct cfattach le_ca = {
 	sizeof(struct le_softc), le_match, le_attach
 };

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_ddb.h"
 #endif

--- a/sys/arch/mvme68k/dev/if_le.c
+++ b/sys/arch/mvme68k/dev/if_le.c
@ -1,4 +1,4 @@
-/*	$NetBSD: if_le.c,v 1.23 2000/09/15 08:50:24 scw Exp $	*/
+/*	$NetBSD: if_le.c,v 1.24 2001/05/30 12:28:46 mrg Exp $	*/

 /*-
 * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -118,7 +118,7 @@ struct cfattach le_pcc_ca = {

 extern struct cfdriver le_cd;

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_ddb.h"
 #endif

--- a/sys/arch/mvme68k/include/cpu.h
+++ b/sys/arch/mvme68k/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.21 2000/11/24 09:36:41 scw Exp $	*/
+/*	$NetBSD: cpu.h,v 1.22 2001/05/30 12:28:47 mrg Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -49,7 +49,7 @@
 * Exported definitions unique to mvme68k/68k cpu support.
 */

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif

--- a/sys/arch/netwinder/include/irqhandler.h
+++ b/sys/arch/netwinder/include/irqhandler.h
@ -1,4 +1,4 @@
-/*	$NetBSD: irqhandler.h,v 1.1 2001/04/19 07:11:02 matt Exp $	*/
+/*	$NetBSD: irqhandler.h,v 1.2 2001/05/30 12:28:47 mrg Exp $	*/

 /*
 * Copyright (c) 1994-1996 Mark Brinicombe.
@ -43,7 +43,7 @@
 #ifndef _ARM32_IRQHANDLER_H_
 #define _ARM32_IRQHANDLER_H_

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_cputypes.h"
 #endif

--- a/sys/arch/news68k/dev/if_le.c
+++ b/sys/arch/news68k/dev/if_le.c
@ -1,4 +1,4 @@
-/*	$NetBSD: if_le.c,v 1.2 2000/02/08 16:17:31 tsutsui Exp $	*/
+/*	$NetBSD: if_le.c,v 1.3 2001/05/30 12:28:47 mrg Exp $	*/

 /*-
 * Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -95,7 +95,7 @@ struct cfattach le_ca = {

 extern volatile u_char *lance_mem, *idrom_addr;

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_ddb.h"
 #endif

--- a/sys/arch/news68k/include/cpu.h
+++ b/sys/arch/news68k/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.9 2001/03/10 18:58:16 tsutsui Exp $	*/
+/*	$NetBSD: cpu.h,v 1.10 2001/05/30 12:28:47 mrg Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -49,7 +49,7 @@
 * Exported definitions unique to news68k cpu support.
 */

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif

--- a/sys/arch/news68k/include/param.h
+++ b/sys/arch/news68k/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.4 2000/11/29 12:32:06 tsutsui Exp $	*/
+/*	$NetBSD: param.h,v 1.5 2001/05/30 12:28:47 mrg Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -84,7 +84,7 @@
 void	_delay __P((u_int));
 #endif /* _KERNEL && !_LOCORE */

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_compat_hpux.h"
 #endif

--- a/sys/arch/newsmips/dev/if_le.c
+++ b/sys/arch/newsmips/dev/if_le.c
@ -1,4 +1,4 @@
-/*	$NetBSD: if_le.c,v 1.6 2000/01/23 15:49:11 tsubai Exp $	*/
+/*	$NetBSD: if_le.c,v 1.7 2001/05/30 12:28:47 mrg Exp $	*/

 /*-
 * Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -90,7 +90,7 @@ struct cfattach le_ca = {
 	sizeof(struct le_softc), le_match, le_attach
 };

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_ddb.h"
 #endif

--- a/sys/arch/newsmips/include/cpu.h
+++ b/sys/arch/newsmips/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.9 2000/05/30 11:42:05 tsubai Exp $	*/
+/*	$NetBSD: cpu.h,v 1.10 2001/05/30 12:28:48 mrg Exp $	*/

 #ifndef _MACHINE_CPU_H_
 #define _MACHINE_CPU_H_
@ -7,7 +7,7 @@
 #include <mips/cpuregs.h>

 #ifndef _LOCORE
-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif

--- a/sys/arch/newsmips/include/param.h
+++ b/sys/arch/newsmips/include/param.h
@ -1,4 +1,4 @@
-/*	from $NetBSD: param.h,v 1.7 2000/06/30 17:55:15 itojun Exp $	*/
+/*	from $NetBSD: param.h,v 1.8 2001/05/30 12:28:48 mrg Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -87,9 +87,9 @@

 #ifndef NMBCLUSTERS

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_gateway.h"
-#endif /* _KERNEL && ! _LKM */
+#endif

 #ifdef GATEWAY
 #define	NMBCLUSTERS	2048		/* map size, max cluster allocation */
--- a/sys/arch/next68k/include/cpu.h
+++ b/sys/arch/next68k/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.17 2001/05/13 16:55:39 chs Exp $	*/
+/*	$NetBSD: cpu.h,v 1.18 2001/05/30 12:28:48 mrg Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -46,7 +46,7 @@
 #ifndef _CPU_MACHINE_
 #define _CPU_MACHINE_

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif

--- a/sys/arch/ofppc/include/cpu.h
+++ b/sys/arch/ofppc/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.15 2001/04/13 23:30:02 thorpej Exp $	*/
+/*	$NetBSD: cpu.h,v 1.16 2001/05/30 12:28:48 mrg Exp $	*/

 /*
 * Copyright (C) 1995-1997 Wolfgang Solfrank.
@ -33,7 +33,7 @@
 #ifndef	_MACHINE_CPU_H_
 #define	_MACHINE_CPU_H_

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif

--- a/sys/arch/ofppc/include/param.h
+++ b/sys/arch/ofppc/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.8 2000/06/30 17:55:16 itojun Exp $	*/
+/*	$NetBSD: param.h,v 1.9 2001/05/30 12:28:48 mrg Exp $	*/

 /*-
 * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -79,9 +79,9 @@

 #ifndef NMBCLUSTERS

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_gateway.h"
-#endif /* _KERNEL && ! _LKM */
+#endif

 #ifdef GATEWAY
 #define	NMBCLUSTERS	512		/* map size, max cluster allocation */
--- a/sys/arch/pc532/include/cpu.h
+++ b/sys/arch/pc532/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.32 2001/01/15 20:19:56 thorpej Exp $	*/
+/*	$NetBSD: cpu.h,v 1.33 2001/05/30 12:28:49 mrg Exp $	*/

 /*-
 * Copyright (c) 1990 The Regents of the University of California.
@ -41,7 +41,7 @@
 #ifndef _NS532_CPU_H_
 #define _NS532_CPU_H_

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif

--- a/sys/arch/pc532/include/param.h
+++ b/sys/arch/pc532/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.25 2000/07/18 12:45:50 matthias Exp $	*/
+/*	$NetBSD: param.h,v 1.26 2001/05/30 12:28:49 mrg Exp $	*/

 /*-
 * Copyright (c) 1990 The Regents of the University of California.
@ -114,9 +114,9 @@

 #ifndef NMBCLUSTERS

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_gateway.h"
-#endif /* _KERNEL && ! _LKM */
+#endif

 #ifdef GATEWAY
 #define	NMBCLUSTERS	512		/* map size, max cluster allocation */
--- a/sys/arch/pmax/include/cpu.h
+++ b/sys/arch/pmax/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.24 2000/05/26 21:20:11 thorpej Exp $	*/
+/*	$NetBSD: cpu.h,v 1.25 2001/05/30 12:28:49 mrg Exp $	*/

 #ifndef _PMAX_CPU_H_
 #define _PMAX_CPU_H_
@ -7,7 +7,7 @@
 #include <mips/cpuregs.h>

 #ifndef _LOCORE
-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif

--- a/sys/arch/pmax/include/param.h
+++ b/sys/arch/pmax/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.33 2000/06/30 17:55:16 itojun Exp $	*/
+/*	$NetBSD: param.h,v 1.34 2001/05/30 12:28:49 mrg Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -82,9 +82,9 @@
 #define	MCLBYTES	(1 << MCLSHIFT)	/* size of a m_buf cluster */
 #define	MCLOFSET	(MCLBYTES - 1)

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_gateway.h"
-#endif /* _KERNEL && ! _LKM */
+#endif

 #ifndef NMBCLUSTERS
 #ifdef GATEWAY
--- a/sys/arch/powerpc/include/param.h
+++ b/sys/arch/powerpc/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.8 2000/06/30 17:55:17 itojun Exp $	*/
+/*	$NetBSD: param.h,v 1.9 2001/05/30 12:28:49 mrg Exp $	*/

 /*-
 * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -79,9 +79,9 @@

 #ifndef NMBCLUSTERS

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_gateway.h"
-#endif /* _KERNEL && ! _LKM */
+#endif

 #ifdef GATEWAY
 #define	NMBCLUSTERS	512		/* map size, max cluster allocation */
--- a/sys/arch/prep/include/cpu.h
+++ b/sys/arch/prep/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.4 2000/12/14 10:33:43 mycroft Exp $	*/
+/*	$NetBSD: cpu.h,v 1.5 2001/05/30 12:28:49 mrg Exp $	*/

 /*
 * Copyright (C) 1995-1997 Wolfgang Solfrank.
@ -33,7 +33,7 @@
 #ifndef	_MACHINE_CPU_H_
 #define	_MACHINE_CPU_H_

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif

--- a/sys/arch/prep/include/param.h
+++ b/sys/arch/prep/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.2 2000/06/30 17:55:17 itojun Exp $	*/
+/*	$NetBSD: param.h,v 1.3 2001/05/30 12:28:49 mrg Exp $	*/

 /*-
 * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -81,9 +81,9 @@

 #ifndef NMBCLUSTERS

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_gateway.h"
-#endif /* _KERNEL && ! _LKM */
+#endif

 #ifdef GATEWAY
 #define	NMBCLUSTERS	512		/* map size, max cluster allocation */
--- a/sys/arch/sandpoint/include/cpu.h
+++ b/sys/arch/sandpoint/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.1 2001/02/04 18:32:12 briggs Exp $	*/
+/*	$NetBSD: cpu.h,v 1.2 2001/05/30 12:28:50 mrg Exp $	*/

 /*
 * Copyright (C) 1995-1997 Wolfgang Solfrank.
@ -33,7 +33,7 @@
 #ifndef	_MACHINE_CPU_H_
 #define	_MACHINE_CPU_H_

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif

--- a/sys/arch/sandpoint/include/param.h
+++ b/sys/arch/sandpoint/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.1 2001/02/04 18:32:14 briggs Exp $	*/
+/*	$NetBSD: param.h,v 1.2 2001/05/30 12:28:50 mrg Exp $	*/

 /*-
 * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -81,9 +81,9 @@

 #ifndef NMBCLUSTERS

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_gateway.h"
-#endif /* _KERNEL && ! _LKM */
+#endif

 #ifdef GATEWAY
 #define	NMBCLUSTERS	2048		/* map size, max cluster allocation */
--- a/sys/arch/sgimips/include/cpu.h
+++ b/sys/arch/sgimips/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.1 2000/06/14 15:39:57 soren Exp $	*/
+/*	$NetBSD: cpu.h,v 1.2 2001/05/30 12:28:50 mrg Exp $	*/

 #ifndef _SGIMIPS_CPU_H
 #define _SGIMIPS_CPU_H
@ -7,7 +7,7 @@
 #include <mips/cpuregs.h>

 #ifndef _LOCORE
-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif

--- a/sys/arch/sgimips/include/param.h
+++ b/sys/arch/sgimips/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.2 2000/06/30 17:55:17 itojun Exp $	*/
+/*	$NetBSD: param.h,v 1.3 2001/05/30 12:28:50 mrg Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -63,9 +63,9 @@
 #define	MCLBYTES	(1 << MCLSHIFT)	/* Size of a m_buf cluster */
 #define	MCLOFSET	(MCLBYTES - 1)

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_gateway.h"
-#endif /* _KERNEL && ! _LKM */
+#endif

 #ifndef NMBCLUSTERS
 #ifdef GATEWAY
--- a/sys/arch/sh3/include/cpu.h
+++ b/sys/arch/sh3/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.11 2001/02/02 18:25:04 thorpej Exp $	*/
+/*	$NetBSD: cpu.h,v 1.12 2001/05/30 12:28:50 mrg Exp $	*/

 /*-
 * Copyright (c) 1990 The Regents of the University of California.
@ -47,7 +47,7 @@
 #ifndef _SH3_CPU_H_
 #define _SH3_CPU_H_

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif

--- a/sys/arch/sparc/dev/if_le_obio.c
+++ b/sys/arch/sparc/dev/if_le_obio.c
@ -1,4 +1,4 @@
-/*	$NetBSD: if_le_obio.c,v 1.11 2001/03/09 10:19:54 pk Exp $	*/
+/*	$NetBSD: if_le_obio.c,v 1.12 2001/05/30 12:28:50 mrg Exp $	*/

 /*-
 * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -92,7 +92,7 @@ struct cfattach le_obio_ca = {

 extern struct cfdriver le_cd;

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_ddb.h"
 #endif

--- a/sys/arch/sparc/include/param.h
+++ b/sys/arch/sparc/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.47 2001/05/10 11:01:08 pk Exp $ */
+/*	$NetBSD: param.h,v 1.48 2001/05/30 12:28:50 mrg Exp $ */

 /*
 * Copyright (c) 1992, 1993
@ -115,9 +115,9 @@ extern int nbpg, pgofset, pgshift;
 #define	MCLSHIFT	11		/* log2(MCLBYTES) */
 #define	MCLOFSET	(MCLBYTES - 1)

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_gateway.h"
-#endif /* _KERNEL && ! _LKM */
+#endif

 #ifndef NMBCLUSTERS
 #ifdef GATEWAY
--- a/sys/arch/sparc/sparc/cpuvar.h
+++ b/sys/arch/sparc/sparc/cpuvar.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpuvar.h,v 1.31 2001/03/16 10:26:11 mrg Exp $ */
+/*	$NetBSD: cpuvar.h,v 1.32 2001/05/30 12:30:41 mrg Exp $ */

 /*
 *  Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -39,7 +39,7 @@
 #ifndef _sparc_cpuvar_h
 #define _sparc_cpuvar_h

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_multiprocessor.h"
 #include "opt_lockdebug.h"
 #endif
--- a/sys/arch/sparc/sparc/openfirm.c
+++ b/sys/arch/sparc/sparc/openfirm.c
@ -1,4 +1,4 @@
-/*	$NetBSD: openfirm.c,v 1.3 2001/03/22 06:21:15 mrg Exp $	*/
+/*	$NetBSD: openfirm.c,v 1.4 2001/05/30 12:28:51 mrg Exp $	*/

 /*
 * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -749,7 +749,7 @@ OF_milliseconds()
 	return (args.ticks);
 }

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_ddb.h"
 #endif

--- a/sys/arch/sparc/sparc/svr4_machdep.c
+++ b/sys/arch/sparc/sparc/svr4_machdep.c
@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_machdep.c,v 1.42 2001/05/27 20:59:22 pk Exp $	 */
+/*	$NetBSD: svr4_machdep.c,v 1.43 2001/05/30 12:28:51 mrg Exp $	 */

 /*-
 * Copyright (c) 1994 The NetBSD Foundation, Inc.
@ -36,7 +36,7 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_kgdb.h"
 #endif

--- a/sys/arch/sparc64/include/param.h
+++ b/sys/arch/sparc64/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.24 2001/02/11 00:07:10 eeh Exp $ */
+/*	$NetBSD: param.h,v 1.25 2001/05/30 12:28:51 mrg Exp $ */

 /*
 * Copyright (c) 1992, 1993
@ -201,9 +201,9 @@ extern int nbpg, pgofset, pgshift;
 #define	MCLSHIFT	11		/* log2(MCLBYTES) */
 #define	MCLOFSET	(MCLBYTES - 1)

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_gateway.h"
-#endif /* _KERNEL && ! _LKM */
+#endif

 #ifndef NMBCLUSTERS
 #ifdef GATEWAY
--- a/sys/arch/sparc64/sparc64/openfirm.c
+++ b/sys/arch/sparc64/sparc64/openfirm.c
@ -1,4 +1,4 @@
-/*	$NetBSD: openfirm.c,v 1.11 2000/11/18 23:43:07 mrg Exp $	*/
+/*	$NetBSD: openfirm.c,v 1.12 2001/05/30 12:28:51 mrg Exp $	*/

 /*
 * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -751,7 +751,7 @@ OF_milliseconds()
 	return (args.ticks);
 }

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_ddb.h"
 #endif

--- a/sys/arch/sun2/include/cpu.h
+++ b/sys/arch/sun2/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.1 2001/04/06 13:13:02 fredette Exp $	*/
+/*	$NetBSD: cpu.h,v 1.2 2001/05/30 12:28:51 mrg Exp $	*/

 /*
 * Copyright (c) 1994 Gordon W. Ross
@ -47,7 +47,7 @@
 #ifndef _CPU_H_
 #define _CPU_H_

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif

--- a/sys/arch/sun3/dev/if_le.c
+++ b/sys/arch/sun3/dev/if_le.c
@ -1,4 +1,4 @@
-/*	$NetBSD: if_le.c,v 1.41 1998/07/21 17:36:05 drochner Exp $	*/
+/*	$NetBSD: if_le.c,v 1.42 2001/05/30 12:28:52 mrg Exp $	*/

 /*-
 * Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -93,7 +93,7 @@ struct cfattach le_ca = {
 	sizeof(struct le_softc), le_match, le_attach
 };

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_ddb.h"
 #endif

--- a/sys/arch/sun3/include/cpu.h
+++ b/sys/arch/sun3/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.28 2001/02/22 07:11:09 chs Exp $	*/
+/*	$NetBSD: cpu.h,v 1.29 2001/05/30 12:28:52 mrg Exp $	*/

 /*
 * Copyright (c) 1994 Gordon W. Ross
@ -47,7 +47,7 @@
 #ifndef _CPU_H_
 #define _CPU_H_

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_lockdebug.h"
 #endif

--- a/sys/arch/vax/include/cpu.h
+++ b/sys/arch/vax/include/cpu.h
@ -1,4 +1,4 @@
-/*      $NetBSD: cpu.h,v 1.56 2001/05/29 21:29:32 ragge Exp $      */
+/*      $NetBSD: cpu.h,v 1.57 2001/05/30 12:28:52 mrg Exp $      */

 /*
 * Copyright (c) 1994 Ludd, University of Lule}, Sweden
@ -33,7 +33,7 @@
 #ifndef _VAX_CPU_H_
 #define _VAX_CPU_H_

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_multiprocessor.h"
 #include "opt_lockdebug.h"
 #endif
--- a/sys/arch/vax/include/param.h
+++ b/sys/arch/vax/include/param.h
@ -1,4 +1,4 @@
-/*      $NetBSD: param.h,v 1.45 2000/11/15 00:49:31 matt Exp $    */
+/*      $NetBSD: param.h,v 1.46 2001/05/30 12:28:52 mrg Exp $    */
 /*-
 * Copyright (c) 1990 The Regents of the University of California.
 * All rights reserved.
@ -112,9 +112,9 @@

 #ifndef NMBCLUSTERS

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_gateway.h"
-#endif /* _KERNEL && ! _LKM */
+#endif

 #ifdef GATEWAY
 #define	NMBCLUSTERS	512		/* map size, max cluster allocation */
--- a/sys/arch/x68k/include/cpu.h
+++ b/sys/arch/x68k/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.25 2000/12/19 21:09:58 scw Exp $	*/
+/*	$NetBSD: cpu.h,v 1.26 2001/05/30 12:28:52 mrg Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -49,7 +49,7 @@
 * Exported definitions unique to x68k/68k cpu support.
 */

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_m680x0.h"
 #include "opt_lockdebug.h"
 #endif
--- a/sys/arch/x68k/include/param.h
+++ b/sys/arch/x68k/include/param.h
@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.15 2001/01/11 13:18:36 minoura Exp $	*/
+/*	$NetBSD: param.h,v 1.16 2001/05/30 12:28:52 mrg Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -87,7 +87,7 @@
 void	_delay __P((u_int));
 #endif /* _KERNEL && !_LOCORE */

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_compat_hpux.h"
 #endif

--- a/sys/miscfs/fdesc/fdesc_vfsops.c
+++ b/sys/miscfs/fdesc/fdesc_vfsops.c
@ -1,4 +1,4 @@
-/*	$NetBSD: fdesc_vfsops.c,v 1.32 2001/01/22 12:17:37 jdolecek Exp $	*/
+/*	$NetBSD: fdesc_vfsops.c,v 1.33 2001/05/30 11:57:16 mrg Exp $	*/

 /*
 * Copyright (c) 1992, 1993, 1995
@ -44,7 +44,7 @@
 * /dev/fd Filesystem
 */

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #endif

--- a/sys/miscfs/kernfs/kernfs_vfsops.c
+++ b/sys/miscfs/kernfs/kernfs_vfsops.c
@ -1,4 +1,4 @@
-/*	$NetBSD: kernfs_vfsops.c,v 1.39 2001/02/04 10:20:00 mrg Exp $	*/
+/*	$NetBSD: kernfs_vfsops.c,v 1.40 2001/05/30 11:57:17 mrg Exp $	*/

 /*
 * Copyright (c) 1992, 1993, 1995
@ -42,7 +42,7 @@
 * Kernel params Filesystem
 */

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #endif

--- a/sys/miscfs/portal/portal_vfsops.c
+++ b/sys/miscfs/portal/portal_vfsops.c
@ -1,4 +1,4 @@
-/*	$NetBSD: portal_vfsops.c,v 1.25 2001/01/22 12:17:39 jdolecek Exp $	*/
+/*	$NetBSD: portal_vfsops.c,v 1.26 2001/05/30 11:57:17 mrg Exp $	*/

 /*
 * Copyright (c) 1992, 1993, 1995
@ -43,7 +43,7 @@
 * Portal Filesystem
 */

-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #endif

--- a/Show More
+++ b/Show More