---

yaml --- r: 31181 b: refs/heads/master c: d0b79c5 h: refs/heads/master i: 31179: 0a8a060 v: v3
git-mirror · Jun 28, 2006 · 4e98cfa · 4e98cfa
1 parent 82e6bf5
commit 4e98cfa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0ce7d0886cf0c2579c604eac41a7e125bc0e96d
+refs/heads/master: d0b79c54fc14f1f2db64180a21b84146028c598b
diff --git a/trunk/arch/powerpc/kernel/head_64.S b/trunk/arch/powerpc/kernel/head_64.S
@@ -1664,6 +1664,9 @@ _STATIC(__after_prom_start)
 					/*   i.e. where we are running	 */
 					/*	the source addr		 */
 
+	cmpdi	r4,0			/* In some cases the loader may  */
+	beq	.start_here_multiplatform /* have already put us at zero */
+					/* so we can skip the copy.      */
 	LOAD_REG_IMMEDIATE(r5,copy_to_here) /* # bytes of memory to copy */
 	sub	r5,r5,r27