Merge branch 'bjorn-cleanups' into release

[linux-2.6-omap-h63xx.git] / arch / arm / kernel / relocate_kernel.S

diff --git a/arch/arm/kernel/relocate_kernel.S b/arch/arm/kernel/relocate_kernel.S
index 7baadae7cb278f7c78fb2dd8ba079b0406f94bc5..61930eb0902941030e3e180aca40f6f82697e39e 100644 (file)
--- a/arch/arm/kernel/relocate_kernel.S
+++ b/arch/arm/kernel/relocate_kernel.S
@@ -50,7 +50,7 @@ relocate_new_kernel:
        mov lr,r1
        mov r0,#0
        ldr r1,kexec_mach_type
-       mov r2,#0
+       ldr r2,kexec_boot_atags
        mov pc,lr
 
        .globl kexec_start_address
@@ -65,6 +65,11 @@ kexec_indirection_page:
 kexec_mach_type:
        .long   0x0
 
+       /* phy addr of the atags for the new kernel */
+       .globl kexec_boot_atags
+kexec_boot_atags:
+       .long   0x0
+
 relocate_new_kernel_end:
 
        .globl relocate_new_kernel_size