From 8303f9e06a41fc78643a6463f9407c453f1cff75 Mon Sep 17 00:00:00 2001
From: Bernd Schmidt <bernds_cb1@t-online.de>
Date: Wed, 7 Jan 2009 23:14:39 +0800
Subject: [PATCH] --- yaml --- r: 127079 b: refs/heads/master c:
 6f985294f7df30c0caa80a795ca10fb6f8466702 h: refs/heads/master i:   127077:
 0fd55a6cca74a860974ae6482272700e95f99017   127075:
 70a7c46ae812cfdf2975a77fc55f5c49242162d1   127071:
 83486833a4188e9e90cf33d6bb8292825e542627 v: v3

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

diff --git a/[refs] b/[refs]
index d4e163debbe2..5da737e68512 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e6d9f511e0188d34fa7a93ce2d0e6194442b0da
+refs/heads/master: 6f985294f7df30c0caa80a795ca10fb6f8466702
diff --git a/trunk/arch/blackfin/kernel/vmlinux.lds.S b/trunk/arch/blackfin/kernel/vmlinux.lds.S
index 3a1f73794aa8..4b4341da0585 100644
--- a/trunk/arch/blackfin/kernel/vmlinux.lds.S
+++ b/trunk/arch/blackfin/kernel/vmlinux.lds.S
@@ -68,6 +68,8 @@ SECTIONS
 		__etext = .;
 	}
 
+	NOTES
+
 	/* Just in case the first read only is a 32-bit access */
 	RO_DATA(4)
 
@@ -167,6 +169,7 @@ SECTIONS
 		. = ALIGN(4);
 		___initramfs_start = .;
 		*(.init.ramfs)
+		. = ALIGN(4);
 		___initramfs_end = .;
 	}
 
@@ -212,7 +215,7 @@ SECTIONS
 		__ebss_b_l1 = .;
 	}
 
-	__l2_lma_start = .;
+	__l2_lma_start = LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1);
 
 	.text_data_l2 L2_START : AT(LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1))
 	{
@@ -236,10 +239,11 @@ SECTIONS
 		. = ALIGN(4);
 		__ebss_l2 = .;
 	}
+
 	/* Force trailing alignment of our init section so that when we
 	 * free our init memory, we don't leave behind a partial page.
 	 */
-	. = LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1);
+	. = LOADADDR(.text_data_l2) + SIZEOF(.text_data_l2);
 	. = ALIGN(PAGE_SIZE);
 	___init_end = .;