---

yaml --- r: 114657 b: refs/heads/master c: 2bda347 h: refs/heads/master i: 114655: 34d2d6d v: v3
git-mirror · Oct 14, 2008 · c4737c2 · c4737c2
1 parent d3552c8
commit c4737c2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b6b574ca7d5d5ba6ae7155c1fb877cc7130eff7
+refs/heads/master: 2bda347bc53fe2cacd5621d8a0426840a8d2a6a6
diff --git a/trunk/arch/powerpc/kernel/head_32.S b/trunk/arch/powerpc/kernel/head_32.S
@@ -110,6 +110,12 @@ __start:
 #ifdef CONFIG_PPC_MULTIPLATFORM
 	cmpwi	0,r5,0
 	beq	1f
+
+	/* find out where we are now */
+	bcl	20,31,$+4
+0:	mflr	r8			/* r8 = runtime addr here */
+	addis	r8,r8,(_stext - 0b)@ha
+	addi	r8,r8,(_stext - 0b)@l	/* current runtime base addr */
 	bl	prom_init
 	trap
 #endif