---

yaml --- r: 200095 b: refs/heads/master c: b34bce4 h: refs/heads/master i: 200093: b38876e 200091: fe1759f 200087: 2d1f6ed 200079: 668c8dd 200063: 302ff22 v: v3
git-mirror · May 31, 2010 · d78a65a · d78a65a
1 parent 8ace88b
commit d78a65a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git 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
@@ -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,12 +39,16 @@ 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
 
 	.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
@@ -1,6 +1,7 @@
 SECTIONS
 {
   .text : {
+	zero_page_pos = .;
 	*(.data)
 	}
 }