Prev: [178/197] mac80211: fix deferred hardware scan requests
Next: [189/197] KVM: allow bit 10 to be cleared in MSR_IA32_MC4_CTL
From: Greg KH on 22 Apr 2010 15:40
2.6.32-stable review patch. If anyone has any objections, please let us know.

------------------

From: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com>

Mainline does not need this fix, as commit
259354deaaf03d49a02dbb9975d6ec2a54675672 fixed the problem by refactoring.

Should use per_cpu_ptr() to obfuscate the per cpu pointers (RELOC_HIDE is needed
for per cpu pointers).

Introduced by commit:

module.c: commit 6b588c18f8dacfa6d7957c33c5ff832096e752d3

This patch should be queued for the stable branch, for kernels 2.6.29.x to
2.6.33.x. (tested on 2.6.33.1 x86_64)

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com>
CC: Randy Dunlap <randy.dunlap(a)oracle.com>
CC: Eric Dumazet <dada1(a)cosmosbay.com>
CC: Rusty Russell <rusty(a)rustcorp.com.au>
CC: Peter Zijlstra <a.p.zijlstra(a)chello.nl>
CC: Tejun Heo <tj(a)kernel.org>
CC: Ingo Molnar <mingo(a)elte.hu>
CC: Andrew Morton <akpm(a)linux-foundation.org>
CC: Linus Torvalds <torvalds(a)linux-foundation.org>
CC: Greg Kroah-Hartman <gregkh(a)suse.de>
CC: Steven Rostedt <rostedt(a)goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
kernel/module.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/kernel/module.c
+++ b/kernel/module.c
@@ -555,7 +555,7 @@ static void percpu_modcopy(void *pcpudes
int cpu;

for_each_possible_cpu(cpu)
- memcpy(pcpudest + per_cpu_offset(cpu), from, size);
+ memcpy(per_cpu_ptr(pcpudest, cpu), from, size);
}

#else /* ... !CONFIG_SMP */


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [178/197] mac80211: fix deferred hardware scan requests
Next: [189/197] KVM: allow bit 10 to be cleared in MSR_IA32_MC4_CTL