remove LKM support

4 files changed, 8 insertions, 27 deletions

diff --git a/sys/kern/exec_conf.c b/sys/kern/exec_conf.c
index 7c362e824d4..fe82f2f9018 100644
--- a/sys/kern/exec_conf.c
+++ b/sys/kern/exec_conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec_conf.c,v 1.31 2013/10/17 10:38:28 deraadt Exp $	*/
+/*	$OpenBSD: exec_conf.c,v 1.32 2014/10/09 04:04:27 tedu Exp $	*/
 /*	$NetBSD: exec_conf.c,v 1.16 1995/12/09 05:34:47 cgd Exp $	*/
 
 /*
@@ -56,13 +56,6 @@ struct execsw execsw[] = {
 #ifdef COMPAT_LINUX
 	{ sizeof(Elf32_Ehdr), exec_linux_elf32_makecmds, &emul_linux_elf },
 #endif
-#ifdef LKM
-	{ 0, NULL, NULL },				/* entries for LKMs */
-	{ 0, NULL, NULL },
-	{ 0, NULL, NULL },
-	{ 0, NULL, NULL },
-	{ 0, NULL, NULL },
-#endif
 };
 int nexecs = (sizeof execsw / sizeof(*execsw));
 int exec_maxhdrsz;
@@ -76,8 +69,6 @@ init_exec(void)
 
 	/*
 	 * figure out the maximum size of an exec header.
-	 * XXX should be able to keep LKM code from modifying exec switch
-	 * when we're still using it, but...
 	 */
 	for (i = 0; i < nexecs; i++)
 		if (execsw[i].es_check != NULL &&
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 1880888b406..3876df294b1 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.h,v 1.128 2014/08/20 06:23:03 mikeb Exp $	*/
+/*	$OpenBSD: conf.h,v 1.129 2014/10/09 04:04:27 tedu Exp $	*/
 /*	$NetBSD: conf.h,v 1.33 1996/05/03 20:03:32 christos Exp $	*/
 
 /*-
@@ -127,7 +127,7 @@ extern struct bdevsw bdevsw[];
 	(dev_type_dump((*))) enodev, 0 }
 
 #define	bdev_lkm_dummy() { \
-	(dev_type_open((*))) lkmenodev, (dev_type_close((*))) enodev, \
+	(dev_type_open((*))) enodev, (dev_type_close((*))) enodev, \
 	(dev_type_strategy((*))) enodev, (dev_type_ioctl((*))) enodev, \
 	(dev_type_dump((*))) enodev, 0 }
 
@@ -215,7 +215,7 @@ extern struct cdevsw cdevsw[];
 	(dev_type_mmap((*))) enodev }
 
 #define	cdev_lkm_dummy() { \
-	(dev_type_open((*))) lkmenodev, (dev_type_close((*))) enodev, \
+	(dev_type_open((*))) enodev, (dev_type_close((*))) enodev, \
 	(dev_type_read((*))) enodev, (dev_type_write((*))) enodev, \
 	(dev_type_ioctl((*))) enodev, (dev_type_stop((*))) enodev, \
 	0, seltrue, (dev_type_mmap((*))) enodev }
@@ -540,14 +540,6 @@ cdev_decl(filedesc);
 
 cdev_decl(log);
 
-#ifndef LKM
-# define	NLKM	0
-# define	lkmenodev	enodev
-#else
-# define	NLKM	1
-#endif
-cdev_decl(lkm);
-
 #define	ptstty		ptytty
 #define	ptsioctl	ptyioctl
 cdev_decl(pts);
diff --git a/sys/sys/shm.h b/sys/sys/shm.h
index 3bbc03cbfa5..d49263bf5b1 100644
--- a/sys/sys/shm.h
+++ b/sys/sys/shm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: shm.h,v 1.25 2013/08/13 05:52:26 guenther Exp $	*/
+/*	$OpenBSD: shm.h,v 1.26 2014/10/09 04:04:27 tedu Exp $	*/
 /*	$NetBSD: shm.h,v 1.20 1996/04/09 20:55:35 cgd Exp $	*/
 
 /*
@@ -89,11 +89,11 @@
  * Segment low boundry address multiple
  * Use PAGE_SIZE for kernel but for userland query the kernel for the value.
  */
-#if defined(_KERNEL) || defined(_STANDALONE) || defined(_LKM)
+#if defined(_KERNEL) || defined(_STANDALONE)
 #define	SHMLBA		PAGE_SIZE
 #else
 #define	SHMLBA		(getpagesize())
-#endif /* _KERNEL || _STANDALONE || _LKM */
+#endif /* _KERNEL || _STANDALONE */
 
 typedef short		shmatt_t;
 
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index a3929a0eda8..08c37248f0d 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: systm.h,v 1.101 2014/07/13 15:46:21 uebayasi Exp $	*/
+/*	$OpenBSD: systm.h,v 1.102 2014/10/09 04:04:27 tedu Exp $	*/
 /*	$NetBSD: systm.h,v 1.50 1996/06/09 04:55:09 briggs Exp $	*/
 
 /*-
@@ -150,8 +150,6 @@ int	enoioctl(void);
 int	enxio(void);
 int	eopnotsupp(void *);
 
-int	lkmenodev(void);
-
 struct vnodeopv_desc;
 void vfs_opv_init_explicit(struct vnodeopv_desc *);
 void vfs_opv_init_default(struct vnodeopv_desc *);