CONFIG_MDULES patch

CONFIG_MDULES patch

[Stanislaw Skowronek]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 240 bytes --]

This is a patch for the (insignificant) bug I found some time ago and
posted this morning.

Stanislaw Skowronek

--<=>--
  "You're not as old as the trees, not as young as the leaves.
   Not as free as the breeze, not as open as the seas."

[-- Attachment #2: Type: TEXT/PLAIN, Size: 1758 bytes --]

diff -urN linux-mips-cvs-orig/arch/mips/kernel/traps.c linux-mips-xkphys/arch/mips/kernel/traps.c
--- linux-mips-cvs-orig/arch/mips/kernel/traps.c	Wed Apr 28 15:54:53 2004
+++ linux-mips-xkphys/arch/mips/kernel/traps.c	Sat May 15 16:09:42 2004
@@ -278,7 +278,10 @@
 	);
 }
 
-#ifdef CONFIG_MDULES
+#ifdef CONFIG_MODULES
+
+extern spinlock_t modlist_lock;
+extern struct list_head modules;
 
 /* Given an address, look for it in the module exception tables. */
 const struct exception_table_entry *search_module_dbetables(unsigned long addr)
diff -urN linux-mips-cvs-orig/include/asm-mips/module.h linux-mips-xkphys/include/asm-mips/module.h
--- linux-mips-cvs-orig/include/asm-mips/module.h	Tue Apr  6 05:13:44 2004
+++ linux-mips-xkphys/include/asm-mips/module.h	Sat May 15 16:09:42 2004
@@ -7,6 +7,7 @@
 	/* Data Bus Error exception tables */
 	const struct exception_table_entry *dbe_table_start;
 	const struct exception_table_entry *dbe_table_end;
+	unsigned int num_dbeentries;
 };
 
 typedef uint8_t Elf64_Byte;		/* Type for a 8-bit quantity.  */
diff -urN linux-mips-cvs-orig/kernel/module.c linux-mips-xkphys/kernel/module.c
--- linux-mips-cvs-orig/kernel/module.c	Fri Apr 23 17:54:22 2004
+++ linux-mips-xkphys/kernel/module.c	Sat May 15 16:09:42 2004
@@ -56,11 +56,11 @@
 	(strcmp(MODULE_SYMBOL_PREFIX literal, (string)) == 0)
 
 /* Protects module list */
-static spinlock_t modlist_lock = SPIN_LOCK_UNLOCKED;
+spinlock_t modlist_lock = SPIN_LOCK_UNLOCKED;
 
 /* List of modules, protected by module_mutex AND modlist_lock */
 static DECLARE_MUTEX(module_mutex);
-static LIST_HEAD(modules);
+LIST_HEAD(modules);
 
 static DECLARE_MUTEX(notify_mutex);
 static struct notifier_block * module_notify_list;

Re: CONFIG_MDULES patch

[Ralf Baechle]

On Sat, May 15, 2004 at 04:19:43PM +0200, Stanislaw Skowronek wrote:

> This is a patch for the (insignificant) bug I found some time ago and
> posted this morning.

The higher powers didn't like your patch.  Last night I've checked in a
patch for this problem which has already been approved from upstream.
Let me know if this works for you.

  Ralf