From f9c5e1ff99f53d128bfd9fd8d1a646cd01c9d6ac Mon Sep 17 00:00:00 2001 From: Hugh Dickins Date: Sat, 23 Feb 2008 19:40:17 +0000 Subject: [PATCH] --- yaml --- r: 86172 b: refs/heads/master c: 1e8352784abaedb424e63fa700e93e6c1307785f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-generic/percpu.h | 2 ++ trunk/include/asm-powerpc/percpu.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d7fea1ca0633..42cf9a4ec19a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a2d5b700132f35401f1d9e22fe3c2cab02c2549 +refs/heads/master: 1e8352784abaedb424e63fa700e93e6c1307785f diff --git a/trunk/include/asm-generic/percpu.h b/trunk/include/asm-generic/percpu.h index 4b8d31cda1a0..b0e63c672ebd 100644 --- a/trunk/include/asm-generic/percpu.h +++ b/trunk/include/asm-generic/percpu.h @@ -32,6 +32,8 @@ extern unsigned long __per_cpu_offset[NR_CPUS]; */ #ifndef __my_cpu_offset #define __my_cpu_offset per_cpu_offset(raw_smp_processor_id()) +#endif +#ifdef CONFIG_DEBUG_PREEMPT #define my_cpu_offset per_cpu_offset(smp_processor_id()) #else #define my_cpu_offset __my_cpu_offset diff --git a/trunk/include/asm-powerpc/percpu.h b/trunk/include/asm-powerpc/percpu.h index ccb0523eb3b4..f879252b7ea6 100644 --- a/trunk/include/asm-powerpc/percpu.h +++ b/trunk/include/asm-powerpc/percpu.h @@ -13,7 +13,7 @@ #include #define __per_cpu_offset(cpu) (paca[cpu].data_offset) -#define __my_cpu_offset get_paca()->data_offset +#define __my_cpu_offset local_paca->data_offset #define per_cpu_offset(x) (__per_cpu_offset(x)) #endif /* CONFIG_SMP */