patch-1.3.99 linux/kernel/module.c

Next file: linux/kernel/sched.c
Previous file: linux/ipc/msg.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.98/linux/kernel/module.c linux/kernel/module.c
@@ -46,12 +46,6 @@
 
 #ifdef CONFIG_MODULES		/* a *big* #ifdef block... */
 
-#ifdef DEBUG_MODULE
-#define PRINTK(a) printk a
-#else
-#define PRINTK(a) /* */
-#endif
-
 static struct module kernel_module;
 static struct module *module_list = &kernel_module;
 
@@ -127,8 +121,8 @@
 	* (long *) addr = 0;	/* set use count to zero */
 	module_list = mp;	/* link it in */
 
-	PRINTK(("module `%s' (%lu pages @ 0x%08lx) created\n",
-		mp->name, (unsigned long) mp->size, (unsigned long) mp->addr));
+	pr_debug("module `%s' (%lu pages @ 0x%08lx) created\n",
+		mp->name, (unsigned long) mp->size, (unsigned long) mp->addr);
 	return (unsigned long) addr;
 }
 
@@ -167,8 +161,8 @@
 
 	if ((error = get_mod_name(module_name, name)) != 0)
 		return error;
-	PRINTK(("initializing module `%s', %d (0x%x) bytes\n",
-		name, codesize, codesize));
+	pr_debug("initializing module `%s', %d (0x%x) bytes\n",
+		name, codesize, codesize);
 	memcpy_fromfs(&rt, routines, sizeof rt);
 	if ((mp = find_module(name)) == NULL)
 		return -ENOENT;
@@ -185,8 +179,8 @@
 	memcpy_fromfs((char *)mp->addr + sizeof (long), code, codesize);
 	memset((char *)mp->addr + sizeof (long) + codesize, 0,
 		mp->size * PAGE_SIZE - (codesize + sizeof (long)));
-	PRINTK(( "module init entry = 0x%08lx, cleanup entry = 0x%08lx\n",
-		(unsigned long) rt.init, (unsigned long) rt.cleanup));
+	pr_debug("module init entry = 0x%08lx, cleanup entry = 0x%08lx\n",
+		(unsigned long) rt.init, (unsigned long) rt.cleanup);
 	mp->cleanup = rt.cleanup;
 
 	/* update kernel symbol table */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this