LKM support is no longer optional.

6 files changed, 3 insertions, 74 deletions

diff --git a/sys/conf/files b/sys/conf/files
index 035f17a..4c374f7 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -46,7 +46,7 @@ kern/kern_exec.c	standard
 kern/kern_exit.c	standard
 kern/kern_fork.c	standard
 kern/kern_ktrace.c	standard
-kern/kern_lkm.c		optional lkm
+kern/kern_lkm.c		standard
 kern/kern_lockf.c	standard
 kern/kern_malloc.c	standard
 kern/kern_ntptime.c	standard
diff --git a/sys/i386/i386/conf.c b/sys/i386/i386/conf.c
index 4692101..b0bb46b 100644
--- a/sys/i386/i386/conf.c
+++ b/sys/i386/i386/conf.c
@@ -41,7 +41,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)conf.c	5.8 (Berkeley) 5/12/91
- *	$Id: conf.c,v 1.32 1994/09/08 18:02:35 jkh Exp $
+ *	$Id: conf.c,v 1.33 1994/09/21 01:33:00 jkh Exp $
  */
 
 #include <sys/param.h>
@@ -69,7 +69,6 @@ typedef int d_mmap_t __P((/* XXX */));
 d_rdwr_t rawread, rawwrite;
 d_strategy_t swstrategy;
 
-#ifdef LKM
 int lkmenodev();
 #define	lkmopen		(d_open_t *)lkmenodev
 #define	lkmclose	(d_close_t *)lkmenodev
@@ -83,20 +82,6 @@ int lkmenodev();
 #define lkmreset	(d_reset_t *)lkmenodev
 #define lkmmmap		(d_mmap_t *)lkmenodev
 #define lkmselect	(d_select_t *)lkmenodev
-#else
-#define	lkmopen		(d_open_t *)enxio
-#define	lkmclose	(d_close_t *)enxio
-#define lkmread		(d_rdwr_t *)enxio
-#define lkmwrite	(d_rdwr_t *)enxio
-#define	lkmstrategy	(d_strategy_t *)enxio
-#define	lkmioctl	(d_ioctl_t *)enxio
-#define	lkmdump		(d_dump_t *)enxio
-#define	lkmsize		(d_psize_t *)0
-#define lkmstop		(d_stop_t *)enxio
-#define lkmreset	(d_reset_t *)enxio
-#define lkmmmap		(d_mmap_t *)enxio
-#define lkmselect	(d_select_t *)enxio
-#endif
 
 #include "wd.h"
 #if (NWD > 0)
@@ -255,7 +240,6 @@ struct bdevsw	bdevsw[] =
 	  cddump,	cdsize,		0 },
 	{ mcdopen,	mcdclose,	mcdstrategy,	mcdioctl,	/*7*/
 	  mcddump,	mcdsize,	0 },
-#ifdef LKM
 	{ lkmopen,	lkmclose,	lkmstrategy,	lkmioctl,	/*8*/
 	  lkmdump,	lkmsize,	NULL },
 	{ lkmopen,	lkmclose,	lkmstrategy,	lkmioctl,	/*9*/
@@ -268,7 +252,6 @@ struct bdevsw	bdevsw[] =
 	  lkmdump,	lkmsize,	NULL },
 	{ lkmopen,	lkmclose,	lkmstrategy,	lkmioctl,	/*13*/
 	  lkmdump,	lkmsize,	NULL },
-#endif
 	/* block device 14 is reserved for local use */
 	{ (d_open_t *)enxio,		(d_close_t *)enxio,
 	  (d_strategy_t *)enxio,	(d_ioctl_t *)enxio,		/*14*/
@@ -544,15 +527,9 @@ d_ioctl_t ukioctl;
 #define	ukioctl		(d_ioctl_t *)enxio
 #endif
 
-#ifdef LKM
 d_open_t lkmcopen;
 d_close_t lkmcclose;
 d_ioctl_t lkmcioctl;
-#else
-#define	lkmcopen	(d_open_t *)enxio
-#define lkmcclose	(d_close_t *)enxio
-#define lkmcioctl	(d_ioctl_t *)enxio
-#endif
 
 #define noopen		(d_open_t *)enodev
 #define noclose		(d_close_t *)enodev
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index b298407..8ac5eae 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -179,7 +179,6 @@ int	ftruncate();
 int	__sysctl();
 int	mlock();
 int	munlock();
-#ifdef LKM
 int	lkmnosys();
 int	lkmnosys();
 int	lkmnosys();
@@ -190,8 +189,6 @@ int	lkmnosys();
 int	lkmnosys();
 int	lkmnosys();
 int	lkmnosys();
-#else
-#endif
 
 #ifdef COMPAT_43
 #define compat(n, name) n, __CONCAT(o,name)
@@ -257,9 +254,6 @@ int	ogetdirentries();
 #ifdef LFS
 #else
 #endif
-#ifdef LKM
-#else
-#endif
 
 #else /* COMPAT_43 */
 #define compat(n, name) 0, nosys
@@ -515,7 +509,6 @@ struct sysent sysent[] = {
 	{ 0, nosys },			/* 207 = nosys */
 	{ 0, nosys },			/* 208 = nosys */
 	{ 0, nosys },			/* 209 = nosys */
-#ifdef LKM
 	{ 0, lkmnosys },			/* 210 = lkmnosys */
 	{ 0, lkmnosys },			/* 211 = lkmnosys */
 	{ 0, lkmnosys },			/* 212 = lkmnosys */
@@ -526,18 +519,6 @@ struct sysent sysent[] = {
 	{ 0, lkmnosys },			/* 217 = lkmnosys */
 	{ 0, lkmnosys },			/* 218 = lkmnosys */
 	{ 0, lkmnosys },			/* 219 = lkmnosys */
-#else
-	{ 0, nosys },			/* 210 = nosys */
-	{ 0, nosys },			/* 211 = nosys */
-	{ 0, nosys },			/* 212 = nosys */
-	{ 0, nosys },			/* 213 = nosys */
-	{ 0, nosys },			/* 214 = nosys */
-	{ 0, nosys },			/* 215 = nosys */
-	{ 0, nosys },			/* 216 = nosys */
-	{ 0, nosys },			/* 217 = nosys */
-	{ 0, nosys },			/* 218 = nosys */
-	{ 0, nosys },			/* 219 = nosys */
-#endif
 };
 
 struct sysentvec aout_sysvec = {
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index bb0bec6..56eecbc 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -255,7 +255,6 @@ char *syscallnames[] = {
 	"#207",			/* 207 = nosys */
 	"#208",			/* 208 = nosys */
 	"#209",			/* 209 = nosys */
-#ifdef LKM
 	"lkmnosys",			/* 210 = lkmnosys */
 	"lkmnosys",			/* 211 = lkmnosys */
 	"lkmnosys",			/* 212 = lkmnosys */
@@ -266,16 +265,4 @@ char *syscallnames[] = {
 	"lkmnosys",			/* 217 = lkmnosys */
 	"lkmnosys",			/* 218 = lkmnosys */
 	"lkmnosys",			/* 219 = lkmnosys */
-#else
-	"#210",			/* 210 = nosys */
-	"#211",			/* 211 = nosys */
-	"#212",			/* 212 = nosys */
-	"#213",			/* 213 = nosys */
-	"#214",			/* 214 = nosys */
-	"#215",			/* 215 = nosys */
-	"#216",			/* 216 = nosys */
-	"#217",			/* 217 = nosys */
-	"#218",			/* 218 = nosys */
-	"#219",			/* 219 = nosys */
-#endif
 };
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index d9fd50e..d9a471e 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
-	$Id: syscalls.master,v 1.8 1994/09/13 14:46:54 dfr Exp $
+	$Id: syscalls.master,v 1.9 1994/09/18 20:39:50 wollman Exp $
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ;
 ; System call name/number master file.
@@ -290,7 +290,6 @@
 ;
 ; The following are reserved for loadable syscalls
 ;
-#ifdef LKM
 210	NODEF	0 NOHIDE lkmnosys
 211	NODEF	0 NOHIDE lkmnosys
 212	NODEF	0 NOHIDE lkmnosys
@@ -301,15 +300,3 @@
 217	NODEF	0 NOHIDE lkmnosys
 218	NODEF	0 NOHIDE lkmnosys
 219	NODEF	0 NOHIDE lkmnosys
-#else
-210	UNIMPL	0 NOHIDE nosys
-211	UNIMPL	0 NOHIDE nosys
-212	UNIMPL	0 NOHIDE nosys
-213	UNIMPL	0 NOHIDE nosys
-214	UNIMPL	0 NOHIDE nosys
-215	UNIMPL	0 NOHIDE nosys
-216	UNIMPL	0 NOHIDE nosys
-217	UNIMPL	0 NOHIDE nosys
-218	UNIMPL	0 NOHIDE nosys
-219	UNIMPL	0 NOHIDE nosys
-#endif
diff --git a/sys/sys/syscall-hide.h b/sys/sys/syscall-hide.h
index b2598bb..e09c893 100644
--- a/sys/sys/syscall-hide.h
+++ b/sys/sys/syscall-hide.h
@@ -218,6 +218,3 @@ HIDE_BSD(ftruncate)
 HIDE_BSD(__sysctl)
 HIDE_BSD(mlock)
 HIDE_BSD(munlock)
-#ifdef LKM
-#else
-#endif