X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f1f885a356aaf04e494adbaa3b5457e434f58640..0432b2b9b938198359cb9e980a72358278f047bb:/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 0c26af2ab..f341051c4 100644 --- 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 -@@ -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 @@