From d78a65a3edaecb577aa970a753713783c4a6629c Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@opensource.se>
Date: Tue, 18 May 2010 14:42:40 +0000
Subject: [PATCH] --- yaml --- r: 200095 b: refs/heads/master c:
 b34bce45530ca897aea35915e0e42eb3c8047b52 h: refs/heads/master i:   200093:
 b38876e4a2b163ca389d36d45c8cb9c2e3026e05   200091:
 fe1759f04db42582b0acf956e9e4c0f6d322c904   200087:
 2d1f6ed89a93df18f6ecc22d81c1445fcec0a965   200079:
 668c8dda7f18ed9796f7c77fbad0480bf7664650   200063:
 302ff22d61a64f9c9b3a14cab6b4e15f19ceae3f v: v3

---
 [refs]                                  |  2 +-
 trunk/arch/sh/boot/romimage/head.S      | 12 +++++++++---
 trunk/arch/sh/boot/romimage/vmlinux.scr |  1 +
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 05d781e37f68..fcd047a74118 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1238c684325d9710544af6f0d11bf7cd6efd5925
+refs/heads/master: b34bce45530ca897aea35915e0e42eb3c8047b52
diff --git a/trunk/arch/sh/boot/romimage/head.S b/trunk/arch/sh/boot/romimage/head.S
index 93e779a405ec..65b8256d81cb 100644
--- a/trunk/arch/sh/boot/romimage/head.S
+++ b/trunk/arch/sh/boot/romimage/head.S
@@ -13,7 +13,9 @@ romstart:
 #include <mach/romimage.h>
 
 	/* copy the empty_zero_page contents to where vmlinux expects it */
-	mova	empty_zero_page_src, r0
+	mova	extra_data_pos, r0
+	mov.l	extra_data_size, r1
+	add	r1, r0
 	mov.l	empty_zero_page_dst, r1
 	mov	#(PAGE_SHIFT - 4), r4
 	mov	#1, r3
@@ -37,7 +39,9 @@ romstart:
 	mov	#PAGE_SHIFT, r4
 	mov	#1, r1
 	shld	r4, r1
-	mova	empty_zero_page_src, r0
+	mova	extra_data_pos, r0
+	add	r1, r0
+	mov.l	extra_data_size, r1
 	add	r1, r0
 	jmp	@r0
 	 nop
@@ -45,4 +49,6 @@ romstart:
 	.align 2
 empty_zero_page_dst:
 	.long	_text
-empty_zero_page_src:
+extra_data_pos:
+extra_data_size:
+	.long	zero_page_pos - extra_data_pos
diff --git a/trunk/arch/sh/boot/romimage/vmlinux.scr b/trunk/arch/sh/boot/romimage/vmlinux.scr
index 287c08f8b4bb..ea27298a99a7 100644
--- a/trunk/arch/sh/boot/romimage/vmlinux.scr
+++ b/trunk/arch/sh/boot/romimage/vmlinux.scr
@@ -1,6 +1,7 @@
 SECTIONS
 {
   .text : {
+	zero_page_pos = .;
 	*(.data)
 	}
 }