[PATCH 1/2] module: fix BUG_ON() for powerpc (and other function descriptor archs)

From: Rusty Russell
Date: Wed Aug 26 2009 - 08:33:04 EST

The rarely-used symbol_put_addr() needs to use dereference_function_descriptor
on powerpc.

Reported-by: Paul Mackerras <paulus@xxxxxxxxx>
Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxxx

diff --git a/kernel/module.c b/kernel/module.c
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -909,16 +909,18 @@ void __symbol_put(const char *symbol)

+/* 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))

/* 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);
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/