diff options
| author | Andi Kleen <ak@suse.de> | 2006-09-26 10:52:40 +0200 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-26 10:52:40 +0200 |
| commit | b38337a624c4d3c2c3d9cdf27d952ca94181c6a8 (patch) | |
| tree | 1e926c0f6af8df631ce726bfec98a020164cf289 /arch/x86_64/kernel/vmlinux.lds.S | |
| parent | [PATCH] Remove unused asm-x86_64/mmx.h (diff) | |
| download | linux-b38337a624c4d3c2c3d9cdf27d952ca94181c6a8.tar.xz linux-b38337a624c4d3c2c3d9cdf27d952ca94181c6a8.zip | |
[PATCH] Mark per cpu data initialization __initdata again
Before 2.6.16 this was changed to work around code that accessed
CPUs not in the possible map. But that code should be all fixed now,
so mark it __initdata again.
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/x86_64/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/x86_64/kernel/vmlinux.lds.S | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86_64/kernel/vmlinux.lds.S b/arch/x86_64/kernel/vmlinux.lds.S index 2802aa963fa3..d0564f1bcb0b 100644 --- a/arch/x86_64/kernel/vmlinux.lds.S +++ b/arch/x86_64/kernel/vmlinux.lds.S @@ -216,14 +216,12 @@ SECTIONS __initramfs_start = .; .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) { *(.init.ramfs) } __initramfs_end = .; - /* temporary here to work around NR_CPUS. If you see this comment in 2.6.17+ - complain */ - . = ALIGN(4096); - __init_end = .; - . = ALIGN(CONFIG_X86_L1_CACHE_BYTES); + . = ALIGN(CONFIG_X86_L1_CACHE_BYTES); __per_cpu_start = .; .data.percpu : AT(ADDR(.data.percpu) - LOAD_OFFSET) { *(.data.percpu) } __per_cpu_end = .; + . = ALIGN(4096); + __init_end = .; . = ALIGN(4096); __nosave_begin = .; |