From 0cc6ee7d296d0ea6b587f65bf722e3b70cdf3add Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Sun, 9 Aug 2009 19:06:24 +0000
Subject: [PATCH] --- yaml --- r: 161750 b: refs/heads/master c:
 903444e4297264ec0959e886695911659edb425c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index faa63459ee6b..3e32dd410034 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a15098c90df1ac2b1bfe1d33dd1c47063213aa9a
+refs/heads/master: 903444e4297264ec0959e886695911659edb425c
diff --git a/trunk/arch/powerpc/kernel/vmlinux.lds.S b/trunk/arch/powerpc/kernel/vmlinux.lds.S
index 8ef8a14abc95..3bb09975e342 100644
--- a/trunk/arch/powerpc/kernel/vmlinux.lds.S
+++ b/trunk/arch/powerpc/kernel/vmlinux.lds.S
@@ -245,10 +245,6 @@ SECTIONS
 	}
 #endif
 
-	. = ALIGN(PAGE_SIZE);
-	_edata  =  .;
-	PROVIDE32 (edata = .);
-
 	/* The initial task and kernel stack */
 #ifdef CONFIG_PPC32
 	. = ALIGN(8192);
@@ -282,6 +278,10 @@ SECTIONS
 		__nosave_end = .;
 	}
 
+	. = ALIGN(PAGE_SIZE);
+	_edata  =  .;
+	PROVIDE32 (edata = .);
+
 /*
  * And finally the bss
  */