[kernel/2.6.38] fix gcc-4.6 set but unused warnings

[openwrt.git] / target / linux / omap24xx / patches-3.1 / 210-omap2-kexec-rewrite.patch

diff --git a/target/linux/omap24xx/patches-3.1/210-omap2-kexec-rewrite.patch b/target/linux/omap24xx/patches-3.1/210-omap2-kexec-rewrite.patch
index 0c26af2..f341051 100644 (file)
--- a/target/linux/omap24xx/patches-3.1/210-omap2-kexec-rewrite.patch
+++ b/target/linux/omap24xx/patches-3.1/210-omap2-kexec-rewrite.patch
@@ -2039,7 +2039,7 @@
                VMLINUX_SYMBOL(__entry_text_start) = .;                 \
 --- a/arch/arm/kernel/sleep.S
 +++ b/arch/arm/kernel/sleep.S
                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:
        .ltorg
        .align  5
  cpu_resume_turn_mmu_on:


@@ -2049,11 +2049,10 @@
        mov     r1, r1
        mov     r1, r1
        mov     pc, r3                  @ jump to virtual address
        mov     r1, r1
        mov     r1, r1
        mov     pc, r3                  @ jump to virtual address

- ENDPROC(cpu_resume_turn_mmu_on)

 +      .popsection
 +      .popsection

+ ENDPROC(cpu_resume_turn_mmu_on)

  cpu_resume_after_mmu:
        str     r5, [r2, r4, lsl #2]    @ restore old mapping
  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 @@
 --- a/arch/arm/mach-omap2/io.c
 +++ b/arch/arm/mach-omap2/io.c
 @@ -36,7 +36,7 @@