]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
module: fix BUG_ON() for powerpc (and other function descriptor archs)
authorRusty Russell <rusty@rustcorp.com.au>
Wed, 26 Aug 2009 12:32:54 +0000 (22:02 +0930)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Aug 2009 19:33:19 +0000 (12:33 -0700)
The rarely-used symbol_put_addr() needs to use dereference_function_descriptor
on powerpc.

Reported-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
kernel/module.c

index fd141140355889abd13630c663e66a2e87267194..07c80e68a6c41a656e109d697597f1c01ab52897 100644 (file)
@@ -909,16 +909,18 @@ void __symbol_put(const char *symbol)
 }
 EXPORT_SYMBOL(__symbol_put);
 
+/* Note this assumes addr is a function, which it currently always is. */
 void symbol_put_addr(void *addr)
 {
        struct module *modaddr;
+       unsigned long a = (unsigned long)dereference_function_descriptor(addr);
 
-       if (core_kernel_text((unsigned long)addr))
+       if (core_kernel_text(a))
                return;
 
        /* module_text_address is safe here: we're supposed to have reference
         * to module from symbol_get, so it can't go away. */
-       modaddr = __module_text_address((unsigned long)addr);
+       modaddr = __module_text_address(a);
        BUG_ON(!modaddr);
        module_put(modaddr);
 }