diff options
| author | Tejun Heo <tj@kernel.org> | 2009-05-12 16:19:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-12 17:11:35 -0400 |
| commit | 9aa7a7d5daa7e33d7e7656bffe76af67c1bf56d2 (patch) | |
| tree | b68726c758a02316c0e42dd934d4e1b789ad034b | |
| parent | f993004d73f266a02f3ac736fafb033c600972d9 (diff) | |
alpha: unbreak percpu again
Commit 9b8de7479d0dbab1ed98b5b015d44232c9d3d08e ("FRV: Fix the section
attribute on UP DECLARE_PER_CPU()") cleaned up DECLARE/DEFINE_PER_CPU()
macros and in the process made alpha percpu.h include
include/asm-generic/percpu.h which breaks compilation due to duplicate
definitions.
Remove inclusion of generic asm helper file and define whatever necessary
in alpha header proper.
In the longer term, percpu definitions will be unified and all these
little subtlties will be removed.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: David Howells <dhowells@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/alpha/include/asm/percpu.h | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/arch/alpha/include/asm/percpu.h b/arch/alpha/include/asm/percpu.h index e9e0bb5a23bf..06c5c7a4afd3 100644 --- a/arch/alpha/include/asm/percpu.h +++ b/arch/alpha/include/asm/percpu.h | |||
| @@ -1,7 +1,9 @@ | |||
| 1 | #ifndef __ALPHA_PERCPU_H | 1 | #ifndef __ALPHA_PERCPU_H |
| 2 | #define __ALPHA_PERCPU_H | 2 | #define __ALPHA_PERCPU_H |
| 3 | |||
| 3 | #include <linux/compiler.h> | 4 | #include <linux/compiler.h> |
| 4 | #include <linux/threads.h> | 5 | #include <linux/threads.h> |
| 6 | #include <linux/percpu-defs.h> | ||
| 5 | 7 | ||
| 6 | /* | 8 | /* |
| 7 | * Determine the real variable name from the name visible in the | 9 | * Determine the real variable name from the name visible in the |
| @@ -73,6 +75,28 @@ extern unsigned long __per_cpu_offset[NR_CPUS]; | |||
| 73 | 75 | ||
| 74 | #endif /* SMP */ | 76 | #endif /* SMP */ |
| 75 | 77 | ||
| 76 | #include <asm-generic/percpu.h> | 78 | #ifdef CONFIG_SMP |
| 79 | #define PER_CPU_BASE_SECTION ".data.percpu" | ||
| 80 | #else | ||
| 81 | #define PER_CPU_BASE_SECTION ".data" | ||
| 82 | #endif | ||
| 83 | |||
| 84 | #ifdef CONFIG_SMP | ||
| 85 | |||
| 86 | #ifdef MODULE | ||
| 87 | #define PER_CPU_SHARED_ALIGNED_SECTION "" | ||
| 88 | #else | ||
| 89 | #define PER_CPU_SHARED_ALIGNED_SECTION ".shared_aligned" | ||
| 90 | #endif | ||
| 91 | #define PER_CPU_FIRST_SECTION ".first" | ||
| 92 | |||
| 93 | #else | ||
| 94 | |||
| 95 | #define PER_CPU_SHARED_ALIGNED_SECTION "" | ||
| 96 | #define PER_CPU_FIRST_SECTION "" | ||
| 97 | |||
| 98 | #endif | ||
| 99 | |||
| 100 | #define PER_CPU_ATTRIBUTES | ||
| 77 | 101 | ||
| 78 | #endif /* __ALPHA_PERCPU_H */ | 102 | #endif /* __ALPHA_PERCPU_H */ |