From b4e9a5a745e0595b98be26bc5ad279b9ba6c9781 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Tue, 26 Sep 2006 10:52:40 +0200
Subject: [PATCH] --- yaml --- r: 35955 b: refs/heads/master c:
 b38337a624c4d3c2c3d9cdf27d952ca94181c6a8 h: refs/heads/master i:   35953:
 bf95c50ff929e00e30e71c7c61a681d529bd3e3d   35951:
 a613fc7b918ef37b3872a7e8fd49ad6ed093c1dd v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86_64/kernel/vmlinux.lds.S | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index c50a9422ec2e..18e79f61966d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73bb5117a448bdf0b56232ca28451fe4c534cb3a
+refs/heads/master: b38337a624c4d3c2c3d9cdf27d952ca94181c6a8
diff --git a/trunk/arch/x86_64/kernel/vmlinux.lds.S b/trunk/arch/x86_64/kernel/vmlinux.lds.S
index 2802aa963fa3..d0564f1bcb0b 100644
--- a/trunk/arch/x86_64/kernel/vmlinux.lds.S
+++ b/trunk/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 = .;