From 4e98cfa57a74bdd2ff69bb878f4a6a5028fd8b7f Mon Sep 17 00:00:00 2001 From: Jimi Xenidis Date: Mon, 26 Jun 2006 04:56:58 -0400 Subject: [PATCH] --- yaml --- r: 31181 b: refs/heads/master c: d0b79c54fc14f1f2db64180a21b84146028c598b h: refs/heads/master i: 31179: 0a8a06005439f3626152507bccb737cb5dd8c73a v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/head_64.S | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a78559c62126..1b425de5a091 100644 --- 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 index da0924293496..f2fab687a01c 100644 --- 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