diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:45:09 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:45:09 -0500 |
| commit | ab639f3593f0b5e4439d549831442c18c3baf989 (patch) | |
| tree | 118743e94e5dc86c835dbc1f1d3bf1612f4ae740 /include/linux/percpu.h | |
| parent | f8a6b2b9cee298a9663cbe38ce1eb5240987cb62 (diff) | |
| parent | 58105ef1857112a186696c9b8957020090226a28 (diff) | |
Merge branch 'core/percpu' into x86/core
Diffstat (limited to 'include/linux/percpu.h')
| -rw-r--r-- | include/linux/percpu.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/percpu.h b/include/linux/percpu.h index 0e24202b5a4e..3577ffd90d45 100644 --- a/include/linux/percpu.h +++ b/include/linux/percpu.h | |||
| @@ -8,8 +8,15 @@ | |||
| 8 | 8 | ||
| 9 | #include <asm/percpu.h> | 9 | #include <asm/percpu.h> |
| 10 | 10 | ||
| 11 | #ifndef PER_CPU_BASE_SECTION | ||
| 11 | #ifdef CONFIG_SMP | 12 | #ifdef CONFIG_SMP |
| 12 | #define PER_CPU_BASE_SECTION ".data.percpu" | 13 | #define PER_CPU_BASE_SECTION ".data.percpu" |
| 14 | #else | ||
| 15 | #define PER_CPU_BASE_SECTION ".data" | ||
| 16 | #endif | ||
| 17 | #endif | ||
| 18 | |||
| 19 | #ifdef CONFIG_SMP | ||
| 13 | 20 | ||
| 14 | #ifdef MODULE | 21 | #ifdef MODULE |
| 15 | #define PER_CPU_SHARED_ALIGNED_SECTION "" | 22 | #define PER_CPU_SHARED_ALIGNED_SECTION "" |
| @@ -20,7 +27,6 @@ | |||
| 20 | 27 | ||
| 21 | #else | 28 | #else |
| 22 | 29 | ||
| 23 | #define PER_CPU_BASE_SECTION ".data" | ||
| 24 | #define PER_CPU_SHARED_ALIGNED_SECTION "" | 30 | #define PER_CPU_SHARED_ALIGNED_SECTION "" |
| 25 | #define PER_CPU_FIRST_SECTION "" | 31 | #define PER_CPU_FIRST_SECTION "" |
| 26 | 32 | ||