[2.1.107][PATCH] Weeding out CONFIG_KERNELD.

Niels Kristian Bech Jensen (nkbj@image.dk)
Thu, 25 Jun 1998 15:13:51 +0200 (CEST)

Hi,
This patch replaces all CONFIG_KERNELDs with CONFIG_KMODs:

diff -urN linux-2.1.107/arch/ppc/chrp_defconfig linux/arch/ppc/chrp_defconfig
--- linux-2.1.107/arch/ppc/chrp_defconfig Wed Jun 17 06:54:01 1998
+++ linux/arch/ppc/chrp_defconfig Thu Jun 25 15:04:13 1998
@@ -21,7 +21,7 @@
CONFIG_EXPERIMENTAL=y
CONFIG_MODULES=y
# CONFIG_MODVERSIONS is not set
-CONFIG_KERNELD=y
+CONFIG_KMOD=y
CONFIG_PCI=y
CONFIG_PCI_OLD_PROC=y
CONFIG_NET=y
diff -urN linux-2.1.107/arch/ppc/common_defconfig linux/arch/ppc/common_defconfig
--- linux-2.1.107/arch/ppc/common_defconfig Wed Jun 17 06:54:01 1998
+++ linux/arch/ppc/common_defconfig Thu Jun 25 15:04:24 1998
@@ -20,7 +20,7 @@
CONFIG_EXPERIMENTAL=y
CONFIG_MODULES=y
CONFIG_MODVERSIONS=y
-CONFIG_KERNELD=y
+CONFIG_KMOD=y
CONFIG_PCI=y
CONFIG_PCI_OLD_PROC=y
CONFIG_NET=y
diff -urN linux-2.1.107/arch/ppc/prep_defconfig linux/arch/ppc/prep_defconfig
--- linux-2.1.107/arch/ppc/prep_defconfig Wed Jun 17 06:54:03 1998
+++ linux/arch/ppc/prep_defconfig Thu Jun 25 15:06:07 1998
@@ -21,7 +21,7 @@
CONFIG_EXPERIMENTAL=y
CONFIG_MODULES=y
CONFIG_MODVERSIONS=y
-CONFIG_KERNELD=y
+CONFIG_KMOD=y
CONFIG_PCI=y
# CONFIG_PCI_OPTIMIZE is not set
CONFIG_PCI_OLD_PROC=y
diff -urN linux-2.1.107/drivers/char/fbmem.c linux/drivers/char/fbmem.c
--- linux-2.1.107/drivers/char/fbmem.c Thu Jun 25 12:34:30 1998
+++ linux/drivers/char/fbmem.c Thu Jun 25 15:01:49 1998
@@ -23,8 +23,8 @@
#ifdef CONFIG_PROC_FS
#include <linux/proc_fs.h>
#endif
-#ifdef CONFIG_KERNELD
-#include <linux/kerneld.h>
+#ifdef CONFIG_KMOD
+#include <linux/kmod.h>
#endif

#ifdef __mc68000__
@@ -262,7 +262,7 @@
}
}

-#ifdef CONFIG_KERNELD
+#ifdef CONFIG_KMOD
static void try_to_load(int fb)
{
char modname[16];
@@ -337,7 +337,7 @@
return -EINVAL;
if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
return -EINVAL;
-#ifdef CONFIG_KERNELD
+#ifdef CONFIG_KMOD
if (!registered_fb[con2fb.framebuffer])
try_to_load(con2fb.framebuffer);
#endif
@@ -419,7 +419,7 @@
int fbidx = GET_FB_IDX(inode->i_rdev);
struct fb_info *info;

-#ifdef CONFIG_KERNELD
+#ifdef CONFIG_KMOD
if (!(info = registered_fb[fbidx]))
try_to_load(fbidx);
#endif
diff -urN linux-2.1.107/drivers/scsi/pluto.c linux/drivers/scsi/pluto.c
--- linux-2.1.107/drivers/scsi/pluto.c Wed Jun 17 06:51:48 1998
+++ linux/drivers/scsi/pluto.c Thu Jun 25 15:02:25 1998
@@ -14,8 +14,8 @@
#include <linux/stat.h>
#include <linux/init.h>
#include <linux/config.h>
-#ifdef CONFIG_KERNELD
-#include <linux/kerneld.h>
+#ifdef CONFIG_KMOD
+#include <linux/kmod.h>
#endif

#include <asm/irq.h>
@@ -104,7 +104,7 @@
fcscount++;
PLND(("%d channels online\n", fcscount))
if (!fcscount) {
-#if defined(MODULE) && defined(CONFIG_FC4_SOC_MODULE) && defined(CONFIG_KERNELD)
+#if defined(MODULE) && defined(CONFIG_FC4_SOC_MODULE) && defined(CONFIG_KMOD)
request_module("soc");

for_each_online_fc_channel(fc)

--
Med venlig hilsen / Best regards
                                                          nkbj@image.dk
Niels Kristian Bech Jensen                   http://www.image.dk/~nkbj/




-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu