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-generic | |
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-generic')
-rw-r--r-- | include/asm-generic/percpu.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/include/asm-generic/percpu.h b/include/asm-generic/percpu.h index b5e53b9ab1f7..e038f13594e5 100644 --- a/include/asm-generic/percpu.h +++ b/include/asm-generic/percpu.h | |||
@@ -9,15 +9,6 @@ extern unsigned long __per_cpu_offset[NR_CPUS]; | |||
9 | 9 | ||
10 | #define per_cpu_offset(x) (__per_cpu_offset[x]) | 10 | #define per_cpu_offset(x) (__per_cpu_offset[x]) |
11 | 11 | ||
12 | /* Separate out the type, so (int[3], foo) works. */ | ||
13 | #define DEFINE_PER_CPU(type, name) \ | ||
14 | __attribute__((__section__(".data.percpu"))) __typeof__(type) per_cpu__##name | ||
15 | |||
16 | #define DEFINE_PER_CPU_SHARED_ALIGNED(type, name) \ | ||
17 | __attribute__((__section__(".data.percpu.shared_aligned"))) \ | ||
18 | __typeof__(type) per_cpu__##name \ | ||
19 | ____cacheline_aligned_in_smp | ||
20 | |||
21 | /* var is in discarded region: offset to particular copy we want */ | 12 | /* var is in discarded region: offset to particular copy we want */ |
22 | #define per_cpu(var, cpu) (*({ \ | 13 | #define per_cpu(var, cpu) (*({ \ |
23 | extern int simple_identifier_##var(void); \ | 14 | extern int simple_identifier_##var(void); \ |
@@ -35,12 +26,6 @@ do { \ | |||
35 | } while (0) | 26 | } while (0) |
36 | #else /* ! SMP */ | 27 | #else /* ! SMP */ |
37 | 28 | ||
38 | #define DEFINE_PER_CPU(type, name) \ | ||
39 | __typeof__(type) per_cpu__##name | ||
40 | |||
41 | #define DEFINE_PER_CPU_SHARED_ALIGNED(type, name) \ | ||
42 | DEFINE_PER_CPU(type, name) | ||
43 | |||
44 | #define per_cpu(var, cpu) (*((void)(cpu), &per_cpu__##var)) | 29 | #define per_cpu(var, cpu) (*((void)(cpu), &per_cpu__##var)) |
45 | #define __get_cpu_var(var) per_cpu__##var | 30 | #define __get_cpu_var(var) per_cpu__##var |
46 | #define __raw_get_cpu_var(var) per_cpu__##var | 31 | #define __raw_get_cpu_var(var) per_cpu__##var |
@@ -49,7 +34,4 @@ do { \ | |||
49 | 34 | ||
50 | #define DECLARE_PER_CPU(type, name) extern __typeof__(type) per_cpu__##name | 35 | #define DECLARE_PER_CPU(type, name) extern __typeof__(type) per_cpu__##name |
51 | 36 | ||
52 | #define EXPORT_PER_CPU_SYMBOL(var) EXPORT_SYMBOL(per_cpu__##var) | ||
53 | #define EXPORT_PER_CPU_SYMBOL_GPL(var) EXPORT_SYMBOL_GPL(per_cpu__##var) | ||
54 | |||
55 | #endif /* _ASM_GENERIC_PERCPU_H_ */ | 37 | #endif /* _ASM_GENERIC_PERCPU_H_ */ |