aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-05-12 15:11:42 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-12 15:11:42 -0700
commit1cd8211f07663ebeac04b19ac849de7ed5eef969 (patch)
tree52ed32a36ced6a10cbaf50fd6665855c3fa9fe15
parentd72737aa817b1219a65e29328d22eefd9faade00 (diff)
Revert "module: fix __module_ref_addr()"
This reverts commit d150a2b96558a7349cbf3a72a279c37bc67d50fb. Thanks to Jiri Benc for finding the problem that this patch is not correct for the 2.6.32-stable series. Cc: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--include/linux/module.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/module.h b/include/linux/module.h
index 460df152964..482efc865ac 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -455,7 +455,7 @@ void symbol_put_addr(void *addr);
static inline local_t *__module_ref_addr(struct module *mod, int cpu)
{
#ifdef CONFIG_SMP
- return (local_t *) per_cpu_ptr(mod->refptr, cpu);
+ return (local_t *) (mod->refptr + per_cpu_offset(cpu));
#else
return &mod->ref;
#endif