Messages in this thread Patch in this message | | | Date | Fri, 30 Nov 2007 12:11:42 +0100 | From | Ingo Molnar <> | Subject | Re: [patch 05/10] x86_64: Use generic percpu |
| |
had rejects - hand-merged to x86.git - please check.
Ingo
----------------> Subject: x86_64: Use generic percpu From: Christoph Lameter <clameter@sgi.com>
x86_64 provides an optimized way to determine the local per cpu area offset through the pda and determines the base by accessing a remote pda.
Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Andi Kleen <ak@suse.de> Signed-off-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- include/asm-x86/percpu_64.h | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-)
Index: linux-x86.q/include/asm-x86/percpu_64.h =================================================================== --- linux-x86.q.orig/include/asm-x86/percpu_64.h +++ linux-x86.q/include/asm-x86/percpu_64.h @@ -8,25 +8,13 @@ from %gs */ #ifdef CONFIG_SMP - #include <asm/pda.h> #define __per_cpu_offset(cpu) (cpu_pda(cpu)->data_offset) -#define __my_cpu_offset() read_pda(data_offset) +#define __my_cpu_offset read_pda(data_offset) #define per_cpu_offset(x) (__per_cpu_offset(x)) -/* var is in discarded region: offset to particular copy we want */ -#define per_cpu(var, cpu) (*({ \ - extern int simple_identifier_##var(void); \ - RELOC_HIDE(&per_cpu__##var, __per_cpu_offset(cpu)); })) -#define __get_cpu_var(var) (*({ \ - extern int simple_identifier_##var(void); \ - RELOC_HIDE(&per_cpu__##var, __my_cpu_offset()); })) -#define __raw_get_cpu_var(var) (*({ \ - extern int simple_identifier_##var(void); \ - RELOC_HIDE(&per_cpu__##var, __my_cpu_offset()); })) - /* A macro to avoid #include hell... */ #define percpu_modcopy(pcpudst, src, size) \ do { \ @@ -36,16 +24,6 @@ do { \ (src), (size)); \ } while (0) -extern void setup_per_cpu_areas(void); - -#else /* ! SMP */ - -#define per_cpu(var, cpu) (*((void)(cpu), &per_cpu__##var)) -#define __get_cpu_var(var) per_cpu__##var -#define __raw_get_cpu_var(var) per_cpu__##var - -#endif /* SMP */ - -#define DECLARE_PER_CPU(type, name) extern __typeof__(type) per_cpu__##name - +#endif +#include <asm-generic/percpu.h> #endif /* _ASM_X8664_PERCPU_H_ */ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |