Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / ppc / boot / simple / relocate.S

diff --git a/arch/ppc/boot/simple/relocate.S b/arch/ppc/boot/simple/relocate.S
index e57d967..2533113 100644 (file)
--- a/arch/ppc/boot/simple/relocate.S
+++ b/arch/ppc/boot/simple/relocate.S
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/boot/simple/relocate.S
- *
  * This is the common part of the loader relocation and initialization
  * process.  All of the board/processor specific initialization is
  * done before we get here.
@@ -50,7 +48,7 @@ relocate:
         * Check if we need to relocate ourselves to the link addr or were
         * we loaded there to begin with.
         */
-       cmp     cr0,r3,r4
+       cmpw    cr0,r3,r4
        beq     start_ldr       /* If 0, we don't need to relocate */
 
        /* Move this code somewhere safe.  This is max(load + size, end)
@@ -122,7 +120,7 @@ do_relocate:
        GETSYM(r4, start)
        mr      r3,r8           /* Get the load addr */
 
-       cmp     cr0,r4,r3       /* If we need to copy from the end, do so */
+       cmpw    cr0,r4,r3       /* If we need to copy from the end, do so */
        bgt     do_relocate_from_end
 
 do_relocate_from_start:
@@ -165,7 +163,7 @@ start_ldr:
        subi    r4,r4,4
        li      r0,0
 50:    stwu    r0,4(r3)
-       cmp     cr0,r3,r4
+       cmpw    cr0,r3,r4
        bne     50b
 90:    mr      r9,r1           /* Save old stack pointer (in case it matters) */
        lis     r1,.stack@h
@@ -196,7 +194,7 @@ start_ldr:
        /*
         * Start at the begining.
         */
-#ifdef CONFIG_PPC_MULTIPLATFORM
+#ifdef CONFIG_PPC_PREP
        li      r9,0xc
        mtlr    r9
        /* tell kernel we're prep, by putting 0xdeadc0de at KERNELLOAD,