From 3c8ca32abde8984bfb394ae75b452ff650350ca3 Mon Sep 17 00:00:00 2001 From: "travis@sgi.com" Date: Wed, 30 Jan 2008 13:32:52 +0100 Subject: [PATCH] --- yaml --- r: 80198 b: refs/heads/master c: 072a1e6953d2caffbad7d217ae51cdc61125960f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-x86/percpu_64.h | 23 ++--------------------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/[refs] b/[refs] index b97269d512db..363c0ac99cba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0af8a5ccc51ee2269712c90ab09c91b0150f4224 +refs/heads/master: 072a1e6953d2caffbad7d217ae51cdc61125960f diff --git a/trunk/include/asm-x86/percpu_64.h b/trunk/include/asm-x86/percpu_64.h index 24fe7075248d..e7f3f6d21759 100644 --- a/trunk/include/asm-x86/percpu_64.h +++ b/trunk/include/asm-x86/percpu_64.h @@ -12,21 +12,10 @@ #include #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 +25,8 @@ 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 +#include #endif /* _ASM_X8664_PERCPU_H_ */