diff options
author | travis@sgi.com <travis@sgi.com> | 2008-01-30 07:32:52 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:32:52 -0500 |
commit | 5280e004fc22314122c84978c0b6a741cf96dc0f (patch) | |
tree | 008b96d81a924be764629f62f98fa5f7c9e04773 /include/asm-s390/percpu.h | |
parent | b32ef636a59aad12f9f9b5dc34c93222842c58ba (diff) |
percpu: move arch XX_PER_CPU_XX definitions into linux/percpu.h
- Special consideration for IA64: Add the ability to specify
arch specific per cpu flags
- remove .data.percpu attribute from DEFINE_PER_CPU for non-smp case.
The arch definitions are all the same. So move them into linux/percpu.h.
We cannot move DECLARE_PER_CPU since some include files just include
asm/percpu.h to avoid include recursion problems.
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Mike Travis <travis@sgi.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-s390/percpu.h')
-rw-r--r-- | include/asm-s390/percpu.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/include/asm-s390/percpu.h b/include/asm-s390/percpu.h index f94d0d3cdb2f..2d676a873858 100644 --- a/include/asm-s390/percpu.h +++ b/include/asm-s390/percpu.h | |||
@@ -34,16 +34,6 @@ | |||
34 | 34 | ||
35 | extern unsigned long __per_cpu_offset[NR_CPUS]; | 35 | extern unsigned long __per_cpu_offset[NR_CPUS]; |
36 | 36 | ||
37 | /* Separate out the type, so (int[3], foo) works. */ | ||
38 | #define DEFINE_PER_CPU(type, name) \ | ||
39 | __attribute__((__section__(".data.percpu"))) \ | ||
40 | __typeof__(type) per_cpu__##name | ||
41 | |||
42 | #define DEFINE_PER_CPU_SHARED_ALIGNED(type, name) \ | ||
43 | __attribute__((__section__(".data.percpu.shared_aligned"))) \ | ||
44 | __typeof__(type) per_cpu__##name \ | ||
45 | ____cacheline_aligned_in_smp | ||
46 | |||
47 | #define __get_cpu_var(var) __reloc_hide(var,S390_lowcore.percpu_offset) | 37 | #define __get_cpu_var(var) __reloc_hide(var,S390_lowcore.percpu_offset) |
48 | #define __raw_get_cpu_var(var) __reloc_hide(var,S390_lowcore.percpu_offset) | 38 | #define __raw_get_cpu_var(var) __reloc_hide(var,S390_lowcore.percpu_offset) |
49 | #define per_cpu(var,cpu) __reloc_hide(var,__per_cpu_offset[cpu]) | 39 | #define per_cpu(var,cpu) __reloc_hide(var,__per_cpu_offset[cpu]) |
@@ -60,11 +50,6 @@ do { \ | |||
60 | 50 | ||
61 | #else /* ! SMP */ | 51 | #else /* ! SMP */ |
62 | 52 | ||
63 | #define DEFINE_PER_CPU(type, name) \ | ||
64 | __typeof__(type) per_cpu__##name | ||
65 | #define DEFINE_PER_CPU_SHARED_ALIGNED(type, name) \ | ||
66 | DEFINE_PER_CPU(type, name) | ||
67 | |||
68 | #define __get_cpu_var(var) __reloc_hide(var,0) | 53 | #define __get_cpu_var(var) __reloc_hide(var,0) |
69 | #define __raw_get_cpu_var(var) __reloc_hide(var,0) | 54 | #define __raw_get_cpu_var(var) __reloc_hide(var,0) |
70 | #define per_cpu(var,cpu) __reloc_hide(var,0) | 55 | #define per_cpu(var,cpu) __reloc_hide(var,0) |
@@ -73,7 +58,4 @@ do { \ | |||
73 | 58 | ||
74 | #define DECLARE_PER_CPU(type, name) extern __typeof__(type) per_cpu__##name | 59 | #define DECLARE_PER_CPU(type, name) extern __typeof__(type) per_cpu__##name |
75 | 60 | ||
76 | #define EXPORT_PER_CPU_SYMBOL(var) EXPORT_SYMBOL(per_cpu__##var) | ||
77 | #define EXPORT_PER_CPU_SYMBOL_GPL(var) EXPORT_SYMBOL_GPL(per_cpu__##var) | ||
78 | |||
79 | #endif /* __ARCH_S390_PERCPU__ */ | 61 | #endif /* __ARCH_S390_PERCPU__ */ |