diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-12-06 19:31:59 -0500 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-12-06 19:31:59 -0500 |
| commit | 8bff05cdafd573a495c466256914995a7830e126 (patch) | |
| tree | 982f23d4ee3b383b1b9daf6b22f89008eaebb6aa | |
| parent | 8566ae6b32f5621bf73f9ac7a85cdce5a9598d34 (diff) | |
| parent | 0db98477f725c1ba8ef480b62ade2036d903df25 (diff) | |
Merge branch 'for-linaro-2.6.36/dirty/gas-workarounds' of git://git.linaro.org/people/dmart/linux-2.6-arm into linaro-2.6.36linux-linaro-2.6.36_upstream_for_Linaro-2.6.37-1001.4
| -rw-r--r-- | arch/arm/kernel/relocate_kernel.S | 12 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/sleep34xx.S | 3 |
2 files changed, 10 insertions, 5 deletions
diff --git a/arch/arm/kernel/relocate_kernel.S b/arch/arm/kernel/relocate_kernel.S index 9cf4cbf8f95b..a2599e7e1510 100644 --- a/arch/arm/kernel/relocate_kernel.S +++ b/arch/arm/kernel/relocate_kernel.S @@ -7,8 +7,8 @@ .globl relocate_new_kernel relocate_new_kernel: - ldr r0,kexec_indirection_page - ldr r1,kexec_start_address + ldr r0,__kexec_indirection_page + ldr r1,__kexec_start_address /* * If there is no indirection page (we are doing crashdumps) @@ -55,27 +55,31 @@ relocate_new_kernel: /* Jump to relocated kernel */ mov lr,r1 mov r0,#0 - ldr r1,kexec_mach_type - ldr r2,kexec_boot_atags + ldr r1,__kexec_mach_type + ldr r2,__kexec_boot_atags mov pc,lr .align .globl kexec_start_address kexec_start_address: +__kexec_start_address: .long 0x0 .globl kexec_indirection_page kexec_indirection_page: +__kexec_indirection_page: .long 0x0 .globl kexec_mach_type kexec_mach_type: +__kexec_mach_type: .long 0x0 /* phy addr of the atags for the new kernel */ .globl kexec_boot_atags kexec_boot_atags: +__kexec_boot_atags: .long 0x0 relocate_new_kernel_end: diff --git a/arch/arm/mach-omap2/sleep34xx.S b/arch/arm/mach-omap2/sleep34xx.S index 06ae9552eff3..2c1038b46817 100644 --- a/arch/arm/mach-omap2/sleep34xx.S +++ b/arch/arm/mach-omap2/sleep34xx.S @@ -163,6 +163,7 @@ sdrc_emr2_1: .word SDRC_EMR2_1_P sdrc_manual_1: .word SDRC_MANUAL_1_P +__es3_sdrc_fix_sz: ENTRY(es3_sdrc_fix_sz) .word . - es3_sdrc_fix THUMB( .thumb ) @@ -261,7 +262,7 @@ restore_es3: bne restore adr r0, es3_sdrc_fix ldr r1, sram_base - ldr r2, es3_sdrc_fix_sz + ldr r2, __es3_sdrc_fix_sz mov r2, r2, ror #2 copy_to_sram: ldmia r0!, {r3} @ val = *src |