diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-10 05:16:17 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-10 05:17:48 -0400 |
| commit | 8293dd6f86e759068ce918aa10ca9c5d6d711cd0 (patch) | |
| tree | de366d69078bf2b98c6765fa4ec1cc652f3d3173 /arch/blackfin | |
| parent | 631595fbf4aeac260e664a8a002897e4db6a50dd (diff) | |
| parent | 467c88fee51e2ae862e9485245687da0730e29aa (diff) | |
Merge branch 'x86/core' into tracing/ftrace
Semantic merge:
kernel/trace/trace_functions_graph.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/blackfin')
| -rw-r--r-- | arch/blackfin/include/asm/percpu.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/blackfin/include/asm/percpu.h b/arch/blackfin/include/asm/percpu.h index 797c0c165069..c94c7bc88c71 100644 --- a/arch/blackfin/include/asm/percpu.h +++ b/arch/blackfin/include/asm/percpu.h | |||
| @@ -3,14 +3,4 @@ | |||
| 3 | 3 | ||
| 4 | #include <asm-generic/percpu.h> | 4 | #include <asm-generic/percpu.h> |
| 5 | 5 | ||
| 6 | #ifdef CONFIG_MODULES | ||
| 7 | #define PERCPU_MODULE_RESERVE 8192 | ||
| 8 | #else | ||
| 9 | #define PERCPU_MODULE_RESERVE 0 | ||
| 10 | #endif | ||
| 11 | |||
| 12 | #define PERCPU_ENOUGH_ROOM \ | ||
| 13 | (ALIGN(__per_cpu_end - __per_cpu_start, SMP_CACHE_BYTES) + \ | ||
| 14 | PERCPU_MODULE_RESERVE) | ||
| 15 | |||
| 16 | #endif /* __ARCH_BLACKFIN_PERCPU__ */ | 6 | #endif /* __ARCH_BLACKFIN_PERCPU__ */ |