From cd7b14e3bfa6d52761e4c1843e2a53bff1964bbe Mon Sep 17 00:00:00 2001
From: Vivek Goyal <vgoyal@in.ibm.com>
Date: Sat, 30 Sep 2006 01:47:55 +0200
Subject: [PATCH] --- yaml --- r: 37235 b: refs/heads/master c:
 120b114237e2461fb4fa437c5c37edf014c916b9 h: refs/heads/master i:   37233:
 51b8f483806c5ee72a2d251ab418aedcf38c41c2   37231:
 b48256d38ab0f114591affdf37b4edd4aa9af9c3 v: v3

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

diff --git a/[refs] b/[refs]
index d6333f41560f..63f8924f57e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d0ef4fd61693acd3741ab7ee544246cda1f8738
+refs/heads/master: 120b114237e2461fb4fa437c5c37edf014c916b9
diff --git a/trunk/arch/x86_64/kernel/vmlinux.lds.S b/trunk/arch/x86_64/kernel/vmlinux.lds.S
index d0564f1bcb0b..f8aeccf105fa 100644
--- a/trunk/arch/x86_64/kernel/vmlinux.lds.S
+++ b/trunk/arch/x86_64/kernel/vmlinux.lds.S
@@ -67,13 +67,6 @@ SECTIONS
 
   _edata = .;			/* End of data section */
 
-  __bss_start = .;		/* BSS */
-  .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
-	*(.bss.page_aligned)	
-	*(.bss)
-	}
-  __bss_stop = .;
-
   . = ALIGN(PAGE_SIZE);
   . = ALIGN(CONFIG_X86_L1_CACHE_BYTES);
   .data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) {
@@ -229,6 +222,13 @@ SECTIONS
   . = ALIGN(4096);
   __nosave_end = .;
 
+  __bss_start = .;		/* BSS */
+  .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
+	*(.bss.page_aligned)
+	*(.bss)
+	}
+  __bss_stop = .;
+
   _end = . ;
 
   /* Sections to be discarded */