Merge to Fedora Core 2 kernel-2.6.8-1.521

[linux-2.6.git] / arch / arm / boot / bootp / init.S

diff --git a/arch/arm/boot/bootp/init.S b/arch/arm/boot/bootp/init.S
index fc4cc2f..df7bc70 100644 (file)
--- a/arch/arm/boot/bootp/init.S
+++ b/arch/arm/boot/bootp/init.S
@@ -20,8 +20,10 @@
                .type   _start, #function
                .globl  _start
 
-_start:                adr     r13, data
+_start:                add     lr, pc, #-0x8           @ lr = current load addr
+               adr     r13, data
                ldmia   r13!, {r4-r6}           @ r5 = dest, r6 = length
+               add     r4, r4, lr              @ r4 = initrd_start + load addr
                bl      move                    @ move the initrd
 
 /*