omap24xx: fix compile error with new binutils (#11072)
authorFelix Fietkau <nbd@openwrt.org>
Sat, 3 Mar 2012 12:00:48 +0000 (12:00 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Sat, 3 Mar 2012 12:00:48 +0000 (12:00 +0000)
SVN-Revision: 30798

target/linux/omap24xx/patches-3.1/210-omap2-kexec-rewrite.patch

index 0c26af2ab105cf30813b77d019cf533208268a6b..f341051c46b705f327cfd3f6d46bb86aaf099fa5 100644 (file)
                VMLINUX_SYMBOL(__entry_text_start) = .;                 \
 --- a/arch/arm/kernel/sleep.S
 +++ b/arch/arm/kernel/sleep.S
-@@ -85,12 +85,14 @@ ENDPROC(cpu_resume_mmu)
+@@ -85,11 +85,13 @@ ENDPROC(cpu_resume_mmu)
        .ltorg
        .align  5
  cpu_resume_turn_mmu_on:
        mov     r1, r1
        mov     r1, r1
        mov     pc, r3                  @ jump to virtual address
- ENDPROC(cpu_resume_turn_mmu_on)
 +      .popsection
+ ENDPROC(cpu_resume_turn_mmu_on)
  cpu_resume_after_mmu:
        str     r5, [r2, r4, lsl #2]    @ restore old mapping
-       mcr     p15, 0, r0, c1, c0, 0   @ turn on D-cache
 --- a/arch/arm/mach-omap2/io.c
 +++ b/arch/arm/mach-omap2/io.c
 @@ -36,7 +36,7 @@