diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-30 09:47:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-30 09:47:16 -0700 |
| commit | d3a47e82b6bc3724dd60f3ee4e84fe4479104382 (patch) | |
| tree | 111db3150bb3773b29dafbbc4263c7ccc4e9000b /arch/ia64/include/asm/sections.h | |
| parent | 99c3563e64cf887cca0b181149c0f85c39569276 (diff) | |
| parent | c459ce8b5a7d933a3bcf6915ab17ac1e036e2ac4 (diff) | |
| download | linux-d3a47e82b6bc3724dd60f3ee4e84fe4479104382.tar.gz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Put the space for cpu0 per-cpu area into .data section
Diffstat (limited to 'arch/ia64/include/asm/sections.h')
| -rw-r--r-- | arch/ia64/include/asm/sections.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/sections.h b/arch/ia64/include/asm/sections.h index f66799891036..1a873b36a4a1 100644 --- a/arch/ia64/include/asm/sections.h +++ b/arch/ia64/include/asm/sections.h @@ -11,6 +11,9 @@ #include <asm-generic/sections.h> extern char __per_cpu_start[], __per_cpu_end[], __phys_per_cpu_start[]; +#ifdef CONFIG_SMP +extern char __cpu0_per_cpu[]; +#endif extern char __start___vtop_patchlist[], __end___vtop_patchlist[]; extern char __start___rse_patchlist[], __end___rse_patchlist[]; extern char __start___mckinley_e9_bundles[], __end___mckinley_e9_bundles[]; |