Name: include kmod.h
Author: Rusty Russell
Status: Simple
Class: Cleanup

D: This patch removes the (gratuitous) #ifdef CONFIG_KMOD from around 
D: #include <linux/kmod.h> throughout the kernel.

diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-params/arch/s390x/kernel/exec32.c working-2.4.14-kmod-used/arch/s390x/kernel/exec32.c
--- working-2.4.14-params/arch/s390x/kernel/exec32.c	Thu Apr 12 12:02:29 2001
+++ working-2.4.14-kmod-used/arch/s390x/kernel/exec32.c	Mon Nov 19 14:19:45 2001
@@ -22,14 +22,11 @@
 #include <linux/spinlock.h>
 #define __NO_VERSION__
 #include <linux/module.h>
+#include <linux/kmod.h>
 
 #include <asm/uaccess.h>
 #include <asm/pgalloc.h>
 #include <asm/mmu_context.h>
-
-#ifdef CONFIG_KMOD
-#include <linux/kmod.h>
-#endif
 
 
 extern void put_dirty_page(struct task_struct * tsk, struct page *page, unsigned long address);
diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-params/arch/sparc64/kernel/traps.c working-2.4.14-kmod-used/arch/sparc64/kernel/traps.c
--- working-2.4.14-params/arch/sparc64/kernel/traps.c	Tue Oct  2 02:19:56 2001
+++ working-2.4.14-kmod-used/arch/sparc64/kernel/traps.c	Mon Nov 19 14:19:38 2001
@@ -32,9 +32,7 @@
 #include <asm/chafsr.h>
 #include <asm/psrcompat.h>
 #include <asm/processor.h>
-#ifdef CONFIG_KMOD
 #include <linux/kmod.h>
-#endif
 
 void bad_trap (struct pt_regs *regs, long lvl)
 {
diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-params/drivers/char/ftape/zftape/zftape-init.c working-2.4.14-kmod-used/drivers/char/ftape/zftape/zftape-init.c
--- working-2.4.14-params/drivers/char/ftape/zftape/zftape-init.c	Fri Sep 14 08:21:32 2001
+++ working-2.4.14-kmod-used/drivers/char/ftape/zftape/zftape-init.c	Mon Nov 19 14:18:21 2001
@@ -30,9 +30,7 @@
 #include <linux/signal.h>
 #include <linux/major.h>
 #include <linux/slab.h>
-#ifdef CONFIG_KMOD
 #include <linux/kmod.h>
-#endif
 #include <linux/fcntl.h>
 #include <linux/wrapper.h>
 #include <linux/smp_lock.h>
diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-params/drivers/ide/ide.c working-2.4.14-kmod-used/drivers/ide/ide.c
--- working-2.4.14-params/drivers/ide/ide.c	Tue Nov  6 11:41:34 2001
+++ working-2.4.14-kmod-used/drivers/ide/ide.c	Mon Nov 19 14:19:13 2001
@@ -149,6 +149,7 @@
 #include <linux/ide.h>
 #include <linux/devfs_fs_kernel.h>
 #include <linux/completion.h>
+#include <linux/kmod.h>
 
 #include <asm/byteorder.h>
 #include <asm/irq.h>
@@ -158,10 +159,6 @@
 
 #include "ide_modes.h"
 
-#ifdef CONFIG_KMOD
-#include <linux/kmod.h>
-#endif /* CONFIG_KMOD */
-
 /* default maximum number of failures */
 #define IDE_DEFAULT_MAX_FAILURES 	1
 
diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-params/drivers/md/md.c working-2.4.14-kmod-used/drivers/md/md.c
--- working-2.4.14-params/drivers/md/md.c	Tue Nov  6 11:41:34 2001
+++ working-2.4.14-kmod-used/drivers/md/md.c	Mon Nov 19 14:19:34 2001
@@ -36,10 +36,7 @@
 #include <linux/devfs_fs_kernel.h>
 
 #include <linux/init.h>
-
-#ifdef CONFIG_KMOD
 #include <linux/kmod.h>
-#endif
 
 #define __KERNEL_SYSCALLS__
 #include <linux/unistd.h>
diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-params/drivers/media/video/cpia.c working-2.4.14-kmod-used/drivers/media/video/cpia.c
--- working-2.4.14-params/drivers/media/video/cpia.c	Tue Nov  6 11:41:34 2001
+++ working-2.4.14-kmod-used/drivers/media/video/cpia.c	Mon Nov 19 14:19:27 2001
@@ -38,10 +38,7 @@
 #include <asm/io.h>
 #include <asm/semaphore.h>
 #include <linux/wrapper.h>
-
-#ifdef CONFIG_KMOD
 #include <linux/kmod.h>
-#endif
 
 #include "cpia.h"
 
diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-params/drivers/mtd/nftlcore.c working-2.4.14-kmod-used/drivers/mtd/nftlcore.c
--- working-2.4.14-params/drivers/mtd/nftlcore.c	Tue Nov  6 11:41:34 2001
+++ working-2.4.14-kmod-used/drivers/mtd/nftlcore.c	Mon Nov 19 14:19:30 2001
@@ -24,10 +24,8 @@
 #include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/blkpg.h>
-
-#ifdef CONFIG_KMOD
 #include <linux/kmod.h>
-#endif
+
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nftl.h>
 #include <linux/mtd/compatmac.h>
diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-params/drivers/net/wan/comx.c working-2.4.14-kmod-used/drivers/net/wan/comx.c
--- working-2.4.14-params/drivers/net/wan/comx.c	Fri Sep 14 09:04:43 2001
+++ working-2.4.14-kmod-used/drivers/net/wan/comx.c	Mon Nov 19 14:18:19 2001
@@ -64,10 +64,7 @@
 #include <asm/uaccess.h>
 #include <linux/ctype.h>
 #include <linux/init.h>
-
-#ifdef CONFIG_KMOD
 #include <linux/kmod.h>
-#endif
 
 #ifndef CONFIG_PROC_FS
 #error For now, COMX really needs the /proc filesystem
diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-params/drivers/scsi/fcal.c working-2.4.14-kmod-used/drivers/scsi/fcal.c
--- working-2.4.14-params/drivers/scsi/fcal.c	Sat Feb 10 06:30:23 2001
+++ working-2.4.14-kmod-used/drivers/scsi/fcal.c	Mon Nov 19 14:18:41 2001
@@ -14,9 +14,7 @@
 #include <linux/stat.h>
 #include <linux/init.h>
 #include <linux/config.h>
-#ifdef CONFIG_KMOD
 #include <linux/kmod.h>
-#endif
 
 #include <asm/irq.h>
 
diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-params/drivers/scsi/pluto.c working-2.4.14-kmod-used/drivers/scsi/pluto.c
--- working-2.4.14-params/drivers/scsi/pluto.c	Sat Feb 10 06:30:23 2001
+++ working-2.4.14-kmod-used/drivers/scsi/pluto.c	Mon Nov 19 14:18:30 2001
@@ -14,9 +14,7 @@
 #include <linux/stat.h>
 #include <linux/init.h>
 #include <linux/config.h>
-#ifdef CONFIG_KMOD
 #include <linux/kmod.h>
-#endif
 
 #include <asm/irq.h>
 
diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-params/drivers/scsi/scsi.c working-2.4.14-kmod-used/drivers/scsi/scsi.c
--- working-2.4.14-params/drivers/scsi/scsi.c	Tue Oct 16 12:30:33 2001
+++ working-2.4.14-kmod-used/drivers/scsi/scsi.c	Mon Nov 19 14:18:28 2001
@@ -55,6 +55,7 @@
 #include <linux/init.h>
 #include <linux/smp_lock.h>
 #include <linux/completion.h>
+#include <linux/kmod.h>
 
 #define __KERNEL_SYSCALLS__
 
@@ -70,9 +71,6 @@
 #include "hosts.h"
 #include "constants.h"
 
-#ifdef CONFIG_KMOD
-#include <linux/kmod.h>
-#endif
 
 #undef USE_STATIC_SCSI_MEMORY
 
diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-params/drivers/scsi/scsi_dma.c working-2.4.14-kmod-used/drivers/scsi/scsi_dma.c
--- working-2.4.14-params/drivers/scsi/scsi_dma.c	Wed Sep  6 08:08:55 2000
+++ working-2.4.14-kmod-used/drivers/scsi/scsi_dma.c	Mon Nov 19 14:18:47 2001
@@ -9,15 +9,11 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/blk.h>
-
+#include <linux/kmod.h>
 
 #include "scsi.h"
 #include "hosts.h"
 #include "constants.h"
-
-#ifdef CONFIG_KMOD
-#include <linux/kmod.h>
-#endif
 
 /*
  * PAGE_SIZE must be a multiple of the sector size (512).  True
diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-base/drivers/scsi/scsi_scan.c working-2.4.14-now/drivers/scsi/scsi_scan.c
--- working-2.4.14-base/drivers/scsi/scsi_scan.c	Fri Oct 12 02:43:30 2001
+++ working-2.4.14-now/drivers/scsi/scsi_scan.c	Wed Nov 21 15:21:44 2001
@@ -12,6 +12,7 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/kmod.h>
 
 #include <linux/blk.h>
 
@@ -19,9 +20,6 @@
 #include "hosts.h"
 #include "constants.h"
 
-#ifdef CONFIG_KMOD
-#include <linux/kmod.h>
-#endif
 
 /* The following devices are known not to tolerate a lun != 0 scan for
  * one reason or another.  Some will respond to all luns, others will
diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-params/drivers/video/fbmem.c working-2.4.14-kmod-used/drivers/video/fbmem.c
--- working-2.4.14-params/drivers/video/fbmem.c	Wed Nov 14 18:44:05 2001
+++ working-2.4.14-kmod-used/drivers/video/fbmem.c	Mon Nov 19 14:19:24 2001
@@ -26,9 +26,7 @@
 #include <linux/console.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
-#ifdef CONFIG_KMOD
 #include <linux/kmod.h>
-#endif
 #include <linux/devfs_fs_kernel.h>
 
 #if defined(__mc68000__) || defined(CONFIG_APUS)
diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-params/fs/exec.c working-2.4.14-kmod-used/fs/exec.c
--- working-2.4.14-params/fs/exec.c	Tue Nov  6 11:41:39 2001
+++ working-2.4.14-kmod-used/fs/exec.c	Mon Nov 19 14:12:39 2001
@@ -37,14 +37,12 @@
 #include <linux/personality.h>
 #define __NO_VERSION__
 #include <linux/module.h>
+#include <linux/kmod.h>
 
 #include <asm/uaccess.h>
 #include <asm/pgalloc.h>
 #include <asm/mmu_context.h>
 
-#ifdef CONFIG_KMOD
-#include <linux/kmod.h>
-#endif
 
 int core_uses_pid;
 
diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-params/fs/fat/cvf.c working-2.4.14-kmod-used/fs/fat/cvf.c
--- working-2.4.14-params/fs/fat/cvf.c	Wed Jul 25 07:23:53 2001
+++ working-2.4.14-kmod-used/fs/fat/cvf.c	Mon Nov 19 14:14:14 2001
@@ -15,9 +15,7 @@
 #include<linux/string.h>
 #include<linux/fat_cvf.h>
 #include<linux/config.h>
-#ifdef CONFIG_KMOD
 #include<linux/kmod.h>
-#endif
 
 #define MAX_CVF_FORMATS 3
 
diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-params/fs/nls/nls_base.c working-2.4.14-kmod-used/fs/nls/nls_base.c
--- working-2.4.14-params/fs/nls/nls_base.c	Sat Feb 10 06:29:44 2001
+++ working-2.4.14-kmod-used/fs/nls/nls_base.c	Mon Nov 19 14:14:17 2001
@@ -15,9 +15,7 @@
 #include <linux/nls.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
-#ifdef CONFIG_KMOD
 #include <linux/kmod.h>
-#endif
 #include <linux/spinlock.h>
 
 static struct nls_table *tables;
diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-params/kernel/ksyms.c working-2.4.14-kmod-used/kernel/ksyms.c
--- working-2.4.14-params/kernel/ksyms.c	Tue Nov  6 11:41:43 2001
+++ working-2.4.14-kmod-used/kernel/ksyms.c	Mon Nov 19 14:14:22 2001
@@ -51,9 +51,7 @@
 #if defined(CONFIG_PROC_FS)
 #include <linux/proc_fs.h>
 #endif
-#ifdef CONFIG_KMOD
 #include <linux/kmod.h>
-#endif
 
 extern void set_device_ro(kdev_t dev,int flag);
 
diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-params/net/bluetooth/af_bluetooth.c working-2.4.14-kmod-used/net/bluetooth/af_bluetooth.c
--- working-2.4.14-params/net/bluetooth/af_bluetooth.c	Sat Sep  8 02:28:38 2001
+++ working-2.4.14-kmod-used/net/bluetooth/af_bluetooth.c	Mon Nov 19 14:18:15 2001
@@ -41,11 +41,8 @@
 #include <linux/skbuff.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
-#include <net/sock.h>
-
-#if defined(CONFIG_KMOD)
 #include <linux/kmod.h>
-#endif
+#include <net/sock.h>
 
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/bluez.h>
diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-params/net/ipv4/af_inet.c working-2.4.14-kmod-used/net/ipv4/af_inet.c
--- working-2.4.14-params/net/ipv4/af_inet.c	Tue Nov  6 11:41:43 2001
+++ working-2.4.14-kmod-used/net/ipv4/af_inet.c	Mon Nov 19 14:17:45 2001
@@ -107,9 +107,7 @@
 #include <linux/mroute.h>
 #endif
 #include <linux/if_bridge.h>
-#ifdef CONFIG_KMOD
 #include <linux/kmod.h>
-#endif
 #ifdef CONFIG_NET_DIVERT
 #include <linux/divert.h>
 #endif /* CONFIG_NET_DIVERT */
diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-params/net/socket.c working-2.4.14-kmod-used/net/socket.c
--- working-2.4.14-params/net/socket.c	Thu Oct 18 07:38:28 2001
+++ working-2.4.14-kmod-used/net/socket.c	Mon Nov 19 14:14:52 2001
@@ -72,10 +72,7 @@
 #include <linux/cache.h>
 #include <linux/module.h>
 #include <linux/highmem.h>
-
-#if defined(CONFIG_KMOD) && defined(CONFIG_NET)
 #include <linux/kmod.h>
-#endif
 
 #include <asm/uaccess.h>