LKMify

2000-11-29 21:51:49 +00:00 · 2000-11-29 21:51:49 +00:00 · 73f3cd8c7e
commit 73f3cd8c7e
parent 7924882d2e
20 changed files with 70 additions and 21 deletions
--- a/sys/arch/hp300/hp300/genassym.cf
+++ b/sys/arch/hp300/hp300/genassym.cf
@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.21 2000/11/21 13:54:14 tsutsui Exp $
+#	$NetBSD: genassym.cf,v 1.22 2000/11/29 21:51:50 jdolecek Exp $

 #
 # Copyright (c) 1982, 1990, 1993
@ -35,7 +35,9 @@
 #	@(#)genassym.c	8.3 (Berkeley) 1/4/94
 #

+if defined(_KERNEL) && !defined(_LKM)
 include "opt_compat_svr4.h"
+endif

 include <sys/param.h>
 include <sys/buf.h>
--- a/sys/arch/hp300/include/hp300spu.h
+++ b/sys/arch/hp300/include/hp300spu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: hp300spu.h,v 1.5 1999/07/31 00:28:20 thorpej Exp $	*/
+/*	$NetBSD: hp300spu.h,v 1.6 2000/11/29 21:51:49 jdolecek Exp $	*/

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

 /*
 * CPU configuration.
--- 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.22 1998/09/13 01:43:17 thorpej Exp $	*/
+/*	$NetBSD: freebsd_machdep.c,v 1.23 2000/11/29 21:53:47 jdolecek Exp $	*/

 /*-
 * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -74,7 +74,9 @@
 *	@(#)machdep.c	7.4 (Berkeley) 6/3/91
 */

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

 #include <sys/param.h>
 #include <sys/systm.h>
--- a/sys/arch/i386/i386/genassym.cf
+++ b/sys/arch/i386/i386/genassym.cf
@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.21 2000/08/16 04:44:35 thorpej Exp $
+#	$NetBSD: genassym.cf,v 1.22 2000/11/29 21:53:47 jdolecek Exp $

 #
 # Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -74,9 +74,11 @@
 #	@(#)genassym.c	5.11 (Berkeley) 5/10/91
 #

+if defined(_KERNEL) && !defined(_LKM)
 include "opt_compat_svr4.h"
 include "opt_compat_freebsd.h"
 include "opt_compat_linux.h"
+endif

 include <sys/param.h>
 include <sys/proc.h>
@ -91,7 +93,9 @@ include <machine/trap.h>
 include <machine/pmap.h>
 include <machine/vmparam.h>

+if defined(_KERNEL) && !defined(_LKM)
 include "apm.h"
+endif
 if NAPM > 0
 include <machine/bioscall.h>
 include <machine/apmvar.h>
@ -110,7 +114,9 @@ ifdef COMPAT_FREEBSD
 include <machine/freebsd_machdep.h>
 endif

+if defined(_KERNEL) && !defined(_LKM)
 include "isa.h"
+endif
 if NISA > 0
 include <machine/isa_machdep.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.10 2000/01/10 19:28:15 matt Exp $	*/
+/*	$NetBSD: ibcs2_machdep.c,v 1.11 2000/11/29 21:53:48 jdolecek Exp $	*/

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

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

 #include <sys/param.h>
 #include <sys/systm.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.47 2000/05/26 21:19:46 thorpej Exp $	 */
+/*	$NetBSD: svr4_machdep.c,v 1.48 2000/11/29 21:53:48 jdolecek Exp $	 */

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

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

 #include <sys/param.h>
 #include <sys/systm.h>
--- a/sys/arch/mac68k/mac68k/genassym.cf
+++ b/sys/arch/mac68k/mac68k/genassym.cf
@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.20 2000/11/21 13:54:15 tsutsui Exp $
+#	$NetBSD: genassym.cf,v 1.21 2000/11/29 21:53:48 jdolecek Exp $

 #
 # Copyright (c) 1990 The Regents of the University of California.
@ -35,7 +35,9 @@
 #	@(#)genassym.c	7.8 (Berkeley) 5/7/91
 #

+if defined(_KERNEL) && !defined(_LKM)
 include "opt_compat_svr4.h"
+endif

 include	<sys/param.h>
 include	<sys/buf.h>
--- a/sys/compat/common/vfs_syscalls_43.c
+++ b/sys/compat/common/vfs_syscalls_43.c
@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_syscalls_43.c,v 1.14 2000/07/26 11:43:07 pk Exp $	*/
+/*	$NetBSD: vfs_syscalls_43.c,v 1.15 2000/11/29 22:05:35 jdolecek Exp $	*/

 /*
 * Copyright (c) 1989, 1993
@ -40,7 +40,9 @@
 *	@(#)vfs_syscalls.c	8.28 (Berkeley) 12/10/94
 */

+#if defined(_KERNEL) && !defined(_LKM)
 #include "fs_union.h"
+#endif

 #include <sys/param.h>
 #include <sys/systm.h>
--- a/sys/compat/freebsd/freebsd_ipc.c
+++ b/sys/compat/freebsd/freebsd_ipc.c
@ -1,4 +1,4 @@
-/*	$NetBSD: freebsd_ipc.c,v 1.7 2000/06/28 15:39:26 mrg Exp $	*/
+/*	$NetBSD: freebsd_ipc.c,v 1.8 2000/11/29 22:05:35 jdolecek Exp $	*/

 /*
 * Copyright (c) 1994 Adam Glass and Charles M. Hannum.  All rights reserved.
@ -30,7 +30,9 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#if defined(_KERNEL) && !defined(_LKM)
 #include "opt_sysv.h"
+#endif

 #include <sys/param.h>
 #include <sys/systm.h>
--- a/sys/compat/hpux/hpux_ipc.c
+++ b/sys/compat/hpux/hpux_ipc.c
@ -1,4 +1,4 @@
-/*	$NetBSD: hpux_ipc.c,v 1.1 1999/08/25 04:50:08 thorpej Exp $	*/
+/*	$NetBSD: hpux_ipc.c,v 1.2 2000/11/29 22:05:36 jdolecek Exp $	*/

 /*-
 * Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -47,7 +47,9 @@
 * calls.
 */

+#if defined(_KERNEL) && !defined(_LKM)
 #include "opt_sysv.h"
+#endif

 #include <sys/types.h>
 #include <sys/param.h>
--- a/sys/compat/hpux/hpux_net.c
+++ b/sys/compat/hpux/hpux_net.c
@ -1,4 +1,4 @@
-/*	$NetBSD: hpux_net.c,v 1.19 2000/05/27 00:40:44 sommerfeld Exp $	*/
+/*	$NetBSD: hpux_net.c,v 1.20 2000/11/29 22:05:36 jdolecek Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -46,7 +46,9 @@
 * Network related HP-UX compatibility routines
 */

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

 #include <sys/param.h>
 #include <sys/systm.h>
--- a/sys/compat/hpux/hpux_tty.c
+++ b/sys/compat/hpux/hpux_tty.c
@ -1,4 +1,4 @@
-/*	$NetBSD: hpux_tty.c,v 1.16 1998/12/10 17:13:08 christos Exp $	*/
+/*	$NetBSD: hpux_tty.c,v 1.17 2000/11/29 22:05:36 jdolecek Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -45,7 +45,9 @@
 /*
 * stty/gtty/termio emulation stuff
 */
+#if defined(_KERNEL) && !defined(_LKM)
 #include "opt_compat_43.h"
+#endif

 #ifndef COMPAT_43
 #define COMPAT_43
--- a/sys/compat/ibcs2/ibcs2_ipc.c
+++ b/sys/compat/ibcs2/ibcs2_ipc.c
@ -1,4 +1,4 @@
-/*	$NetBSD: ibcs2_ipc.c,v 1.11 2000/06/28 15:39:28 mrg Exp $	*/
+/*	$NetBSD: ibcs2_ipc.c,v 1.12 2000/11/29 22:05:36 jdolecek Exp $	*/

 /*
 * Copyright (c) 1995 Scott Bartram
@ -23,7 +23,10 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+
+#if defined(_KERNEL) && !defined(_LKM)
 #include "opt_sysv.h"
+#endif

 #include <sys/param.h>
 #include <sys/systm.h>
--- a/sys/compat/linux/arch/alpha/linux_machdep.c
+++ b/sys/compat/linux/arch/alpha/linux_machdep.c
@ -1,4 +1,4 @@
-/*	$NetBSD: linux_machdep.c,v 1.11 2000/11/27 22:23:09 jdolecek Exp $	*/
+/*	$NetBSD: linux_machdep.c,v 1.12 2000/11/29 22:05:36 jdolecek Exp $	*/

 /*-
 * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -80,7 +80,9 @@
 #include <machine/alpha.h>
 #include <machine/reg.h>

+#if defined(_KERNEL) && !defined(_LKM)
 #include "wsdisplay.h"
+#endif
 #if (NWSDISPLAY >0)
 #include <sys/ioctl.h>
 #include <dev/wscons/wsdisplay_usl_io.h>
--- a/sys/compat/linux/arch/i386/linux_machdep.c
+++ b/sys/compat/linux/arch/i386/linux_machdep.c
@ -1,4 +1,4 @@
-/*	$NetBSD: linux_machdep.c,v 1.50 2000/06/11 09:19:27 veego Exp $	*/
+/*	$NetBSD: linux_machdep.c,v 1.51 2000/11/29 22:05:36 jdolecek Exp $	*/

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

+#if defined(KERNEL) && !defined(_LKM)
 #include "opt_vm86.h"
 #include "opt_user_ldt.h"
+#endif

 #include <sys/param.h>
 #include <sys/systm.h>
@ -84,12 +86,16 @@
 /*
 * To see whether wscons is configured (for virtual console ioctl calls).
 */
+#if defined(_KERNEL) && !defined(_LKM)
 #include "wsdisplay.h"
+#endif
 #if (NWSDISPLAY > 0)
 #include <sys/ioctl.h>
 #include <dev/wscons/wsdisplay_usl_io.h>
+#if defined(_KERNEL) && !defined(_LKM)
 #include "opt_xserver.h"
 #endif
+#endif

 #ifdef USER_LDT
 #include <machine/cpu.h>
--- a/sys/compat/linux/common/linux_ioctl.c
+++ b/sys/compat/linux/common/linux_ioctl.c
@ -1,4 +1,4 @@
-/*	$NetBSD: linux_ioctl.c,v 1.22 1998/12/15 10:32:16 augustss Exp $	*/
+/*	$NetBSD: linux_ioctl.c,v 1.23 2000/11/29 22:05:37 jdolecek Exp $	*/

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

+#if defined(_KERNEL) && !defined(_LKM)
 #include "sequencer.h"
+#endif

 #include <sys/param.h>
 #include <sys/proc.h>
--- a/sys/compat/netbsd32/netbsd32_compat_10.c
+++ b/sys/compat/netbsd32/netbsd32_compat_10.c
@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_compat_10.c,v 1.8 2000/11/18 03:23:53 mrg Exp $	*/
+/*	$NetBSD: netbsd32_compat_10.c,v 1.9 2000/11/29 22:05:37 jdolecek Exp $	*/

 /*
 * Copyright (c) 1994 Adam Glass and Charles M. Hannum.  All rights reserved.
@ -30,8 +30,10 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

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

 #include <sys/param.h>
 #include <sys/systm.h>
--- a/sys/compat/osf1/osf1_ioctl.c
+++ b/sys/compat/osf1/osf1_ioctl.c
@ -1,4 +1,4 @@
-/*	$NetBSD: osf1_ioctl.c,v 1.12 2000/06/06 19:04:18 soren Exp $	*/
+/*	$NetBSD: osf1_ioctl.c,v 1.13 2000/11/29 22:05:37 jdolecek Exp $	*/

 /*
 * Copyright (c) 1999 Christopher G. Demetriou.  All rights reserved.
@ -57,8 +57,10 @@
 * rights to redistribute these changes.
 */

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

 #include <sys/param.h>
 #include <sys/systm.h>
--- a/sys/compat/svr4/svr4_ipc.c
+++ b/sys/compat/svr4/svr4_ipc.c
@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_ipc.c,v 1.9 1999/09/07 18:20:19 christos Exp $	*/
+/*	$NetBSD: svr4_ipc.c,v 1.10 2000/11/29 22:05:37 jdolecek Exp $	*/

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

+#if defined(_KERNEL) && !defined(_LKM)
 #include "opt_sysv.h"
+#endif

 #include <sys/types.h>
 #include <sys/param.h>
--- a/sys/compat/ultrix/ultrix_ioctl.c
+++ b/sys/compat/ultrix/ultrix_ioctl.c
@ -1,4 +1,4 @@
-/*	$NetBSD: ultrix_ioctl.c,v 1.14 2000/03/30 11:27:21 augustss Exp $ */
+/*	$NetBSD: ultrix_ioctl.c,v 1.15 2000/11/29 22:05:38 jdolecek Exp $ */
 /*	from : NetBSD: sunos_ioctl.c,v 1.21 1995/10/07 06:27:31 mycroft Exp */

 /*
@ -27,8 +27,10 @@
 * loosely from: Header: sunos_ioctl.c,v 1.7 93/05/28 04:40:43 torek Exp 
 */

+#if defined(_KERNEL) && !defined(_LKM)
 #include "opt_compat_ultrix.h"
 #include "opt_compat_sunos.h"
+#endif

 #include <sys/param.h>
 #include <sys/proc.h>
@ -49,7 +51,7 @@

 #include <compat/sunos/sunos.h>

-#include "ultrix_tty.h"
+#include <compat/ultrix/ultrix_tty.h>

 #define emul_termio	ultrix_termio
 #define emul_termios	ultrix_termios