[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 6da3478..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
@@ -1,6 +1,6 @@
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1876,7 +1876,7 @@ config XIP_PHYS_ADDR
+@@ -1888,7 +1888,7 @@ config XIP_PHYS_ADDR
  
  config KEXEC
        bool "Kexec system call (EXPERIMENTAL)"
@@ -201,7 +201,7 @@
  EXPORT_SYMBOL_GPL(arm_pm_restart);
  
  static void do_nothing(void *unused)
-@@ -250,7 +274,15 @@ void machine_power_off(void)
+@@ -253,7 +277,15 @@ void machine_power_off(void)
  void machine_restart(char *cmd)
  {
        machine_shutdown();
@@ -219,10 +219,10 @@
  void __show_regs(struct pt_regs *regs)
 --- a/arch/arm/kernel/setup.c
 +++ b/arch/arm/kernel/setup.c
-@@ -890,8 +890,8 @@ void __init setup_arch(char **cmdline_p)
-       machine_desc = mdesc;
-       machine_name = mdesc->name;
- 
+@@ -896,8 +896,8 @@ void __init setup_arch(char **cmdline_p)
+               arm_dma_zone_size = mdesc->dma_zone_size;
+       }
+ #endif
 -      if (mdesc->soft_reboot)
 -              reboot_setup("s");
 +      if (mdesc->restart_mode)
@@ -230,7 +230,7 @@
  
        init_mm.start_code = (unsigned long) _text;
        init_mm.end_code   = (unsigned long) _etext;
-@@ -910,6 +910,9 @@ void __init setup_arch(char **cmdline_p)
+@@ -916,6 +916,9 @@ void __init setup_arch(char **cmdline_p)
        paging_init(mdesc);
        request_standard_resources(mdesc);
  
@@ -2039,7 +2039,7 @@
                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:
@@ -2049,11 +2049,10 @@
        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 @@