[pre-2.1.90-1][PATCH] Switch from kerneld to kmod.

Niels Kristian Bech Jensen (nkbj@image.dk)
Wed, 11 Mar 1998 10:49:34 +0100 (CET)

Messages sorted by: [ date ][ thread ][ subject ][ author ]
Next message: Trond Eivind =?ISO-8859-1?Q?Glomsr=F8d?=: "Re: ParPort problem ?"
Previous message: Andreas Jellinghaus: "Re: [ADMINISTRIVIA] Re: SPAM on linux-kernel"

Hi,
This patch corrects a few bugs generated by the switch from kerneld to
kmod. They are two types:

1. I've replaced CONFIG_KERNELD with CONFIG_KMOD in a few places.
2. I've replaced '#include <linux/kerneld.h>' with '#include
<linux/kmod.h>' in a few places.

I've also run 'make checkconfig' and removed a few unused '#include
<linux/config.h>'.

The function 'flush_msg' in ipc/msg.c is unused and could be removed.

One problem for which I don't have any solution is the use of
'kerneld_msqid' in arch/sparc64/kernel/sys_sparc32.c.

diff -urN linux-pre-2.1.90-1/arch/sparc64/kernel/traps.c linux/arch/sparc64/kernel/traps.c
--- linux-pre-2.1.90-1/arch/sparc64/kernel/traps.c Tue Jan 13 00:15:44 1998
+++ linux/arch/sparc64/kernel/traps.c Wed Mar 11 10:15:31 1998
@@ -26,8 +26,8 @@
#include <asm/uaccess.h>
#include <asm/fpumacro.h>
#include <asm/lsu.h>
-#ifdef CONFIG_KERNELD
-#include <linux/kerneld.h>
+#ifdef CONFIG_KMOD
+#include <linux/kmod.h>
#endif

/* #define SYSCALL_TRACING */
@@ -327,7 +327,7 @@
case (2 << 14): /* unfinished_FPop */
case (3 << 14): /* unimplemented_FPop */
#ifdef CONFIG_MATHEMU_MODULE
-#ifdef CONFIG_KERNELD
+#ifdef CONFIG_KMOD
if (!handle_mathemu)
request_module("math-emu");
#endif
diff -urN linux-pre-2.1.90-1/drivers/char/ftape/zftape/zftape-read.c linux/drivers/char/ftape/zftape/zftape-read.c
--- linux-pre-2.1.90-1/drivers/char/ftape/zftape/zftape-read.c Wed Mar 11 10:08:02 1998
+++ linux/drivers/char/ftape/zftape/zftape-read.c Wed Mar 11 10:28:08 1998
@@ -24,7 +24,6 @@
* for the QIC-117 floppy-tape driver for Linux.
*/

-#include <linux/config.h>
#include <linux/errno.h>
#include <linux/mm.h>

diff -urN linux-pre-2.1.90-1/drivers/char/ftape/zftape/zftape-write.c linux/drivers/char/ftape/zftape/zftape-write.c
--- linux-pre-2.1.90-1/drivers/char/ftape/zftape/zftape-write.c Wed Mar 11 10:08:02 1998
+++ linux/drivers/char/ftape/zftape/zftape-write.c Wed Mar 11 10:28:20 1998
@@ -24,7 +24,6 @@
* for the QIC-117 floppy-tape driver for Linux.
*/

-#include <linux/config.h>
#include <linux/errno.h>
#include <linux/mm.h>

diff -urN linux-pre-2.1.90-1/drivers/net/ppp.c linux/drivers/net/ppp.c
--- linux-pre-2.1.90-1/drivers/net/ppp.c Wed Mar 11 10:08:03 1998
+++ linux/drivers/net/ppp.c Wed Mar 11 10:15:56 1998
@@ -51,7 +51,7 @@

/* $Id: ppp.c,v 1.14 1997/11/27 06:04:45 paulus Exp $ */

-#include <linux/config.h> /* for CONFIG_KERNELD */
+#include <linux/config.h> /* for CONFIG_KMOD */
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/sched.h>
diff -urN linux-pre-2.1.90-1/drivers/scsi/scsi_error.c linux/drivers/scsi/scsi_error.c
--- linux-pre-2.1.90-1/drivers/scsi/scsi_error.c Wed Mar 11 10:08:04 1998
+++ linux/drivers/scsi/scsi_error.c Wed Mar 11 10:29:30 1998
@@ -8,7 +8,6 @@
*
*/

-#include <linux/config.h>
#define __NO_VERSION__
#include <linux/module.h>

diff -urN linux-pre-2.1.90-1/drivers/scsi/scsi_obsolete.c linux/drivers/scsi/scsi_obsolete.c
--- linux-pre-2.1.90-1/drivers/scsi/scsi_obsolete.c Wed Mar 11 10:08:04 1998
+++ linux/drivers/scsi/scsi_obsolete.c Wed Mar 11 10:29:42 1998
@@ -43,7 +43,6 @@
* driver uses the new code this *ENTIRE* file will be nuked.
*/

-#include <linux/config.h> /* for CONFIG_KERNELD */
#define __NO_VERSION__
#include <linux/module.h>

diff -urN linux-pre-2.1.90-1/drivers/scsi/scsi_queue.c linux/drivers/scsi/scsi_queue.c
--- linux-pre-2.1.90-1/drivers/scsi/scsi_queue.c Wed Mar 11 10:08:04 1998
+++ linux/drivers/scsi/scsi_queue.c Wed Mar 11 10:30:09 1998
@@ -10,7 +10,6 @@
* we attempt to remove commands from the queue and retry them.
*/

-#include <linux/config.h>
#define __NO_VERSION__
#include <linux/module.h>

diff -urN linux-pre-2.1.90-1/drivers/sound/audio.c linux/drivers/sound/audio.c
--- linux-pre-2.1.90-1/drivers/sound/audio.c Thu Feb 26 12:44:21 1998
+++ linux/drivers/sound/audio.c Wed Mar 11 10:17:28 1998
@@ -21,7 +21,7 @@

#include <linux/config.h>
#include <linux/stddef.h>
-#include <linux/kerneld.h>
+#include <linux/kmod.h>

#include "sound_config.h"

diff -urN linux-pre-2.1.90-1/drivers/sound/midibuf.c linux/drivers/sound/midibuf.c
--- linux-pre-2.1.90-1/drivers/sound/midibuf.c Sun Mar 8 15:47:47 1998
+++ linux/drivers/sound/midibuf.c Wed Mar 11 10:17:40 1998
@@ -15,7 +15,7 @@
*/
#include <linux/config.h>
#include <linux/stddef.h>
-#include <linux/kerneld.h>
+#include <linux/kmod.h>

#define MIDIBUF_C

diff -urN linux-pre-2.1.90-1/drivers/sound/soundcard.c linux/drivers/sound/soundcard.c
--- linux-pre-2.1.90-1/drivers/sound/soundcard.c Sun Mar 8 15:47:47 1998
+++ linux/drivers/sound/soundcard.c Wed Mar 11 10:17:08 1998
@@ -26,7 +26,7 @@
#include <linux/fcntl.h>
#include <linux/ctype.h>
#include <linux/stddef.h>
-#include <linux/kerneld.h>
+#include <linux/kmod.h>
#ifdef __KERNEL__
#include <asm/io.h>
#include <asm/segment.h>
@@ -439,7 +439,7 @@

case SND_DEV_CTL:
dev >>= 4;
-#ifdef CONFIG_KERNELD
+#ifdef CONFIG_KMOD
if (dev >= 0 && dev < MAX_MIXER_DEV && mixer_devs[dev] == NULL) {
char modname[20];
sprintf(modname, "mixer%d", dev);
@@ -555,14 +555,14 @@
{
if (mixdev < 0 || mixdev >= MAX_MIXER_DEV)
return -ENXIO;
-#ifdef CONFIG_KERNELD
+#ifdef CONFIG_KMOD
/* Try to load the mixer... */
if (mixer_devs[mixdev] == NULL) {
char modname[20];
sprintf(modname, "mixer%d", mixdev);
request_module(modname);
}
-#endif /* CONFIG_KERNELD */
+#endif /* CONFIG_KMOD */
if (mixdev >= num_mixers || !mixer_devs[mixdev])
return -ENXIO;
if (cmd == SOUND_MIXER_INFO)
diff -urN linux-pre-2.1.90-1/ipc/msg.c linux/ipc/msg.c
--- linux-pre-2.1.90-1/ipc/msg.c Wed Mar 11 10:08:11 1998
+++ linux/ipc/msg.c Wed Mar 11 10:30:23 1998
@@ -3,7 +3,6 @@
* Copyright (C) 1992 Krishna Balasubramanian
*/

-#include <linux/config.h>
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/msg.h>

-- 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

Next message: Trond Eivind =?ISO-8859-1?Q?Glomsr=F8d?=: "Re: ParPort problem ?"
Previous message: Andreas Jellinghaus: "Re: [ADMINISTRIVIA] Re: SPAM on linux-kernel"