update kexec to 2.6.39 version, still doesn't work...

[ms2-kexec] / relocate_kernel.S

diff --git a/relocate_kernel.S b/relocate_kernel.S
index 61930eb0902941030e3e180aca40f6f82697e39e..9cf4cbf8f95b8ca9eef1baf1d8f49054999304f8 100644 (file)
--- a/relocate_kernel.S
+++ b/relocate_kernel.S
@@ -10,6 +10,12 @@ relocate_new_kernel:
        ldr     r0,kexec_indirection_page
        ldr     r1,kexec_start_address
 
+       /*
+        * If there is no indirection page (we are doing crashdumps)
+        * skip any relocation.
+        */
+       cmp     r0, #0
+       beq     2f
 
 0:     /* top, read another word for the indirection page */
        ldr     r3, [r0],#4
@@ -53,6 +59,8 @@ relocate_new_kernel:
        ldr r2,kexec_boot_atags
        mov pc,lr
 
+       .align
+
        .globl kexec_start_address
 kexec_start_address:
        .long   0x0