Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-04-28 13:17:10 +0200
committerJiri Kosina <jkosina@suse.cz>2010-04-28 13:17:26 +0200
commit6f0d378f9f0c61cafb9211fba3cf37abd48e3440 (patch)
tree057e4100c55856f2a36be5b721172404c0924e7b
parenta29f1085dd82397796f2ca6a4edfe81d442cb4fb (diff)
- patches.suse/revert-percpu-stable-changes.patch: Revert module.c
and module.h changes from -stable update (bnc#600364). suse-commit: 958ef325a0bebf0fe9db11214cf3f17fe0784426
-rw-r--r--include/linux/module.h2
-rw-r--r--kernel/module.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/module.h b/include/linux/module.h
index fb3d3dfd94a1..d13039436526 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -459,7 +459,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
diff --git a/kernel/module.c b/kernel/module.c
index e89652e8e494..aced405a140c 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -572,7 +572,7 @@ static void percpu_modcopy(void *pcpudest, const void *from, unsigned long size)
int cpu;
for_each_possible_cpu(cpu)
- memcpy(per_cpu_ptr(pcpudest, cpu), from, size);
+ memcpy(pcpudest + per_cpu_offset(cpu), from, size);
}
#else /* ... !CONFIG_SMP */