diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-03-03 12:00:48 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-03-03 12:00:48 +0000 |
| commit | 2f3210027ca1393766b0293b1bdd9fc6a13e88d7 (patch) | |
| tree | a950eb04a561c5db44ad0f6517b314cd1e025721 /target/linux/omap24xx/patches-3.1/210-omap2-kexec-rewrite.patch | |
| parent | 4eb5b6210db95eb5f35124dc587e1a4a7c9118f8 (diff) | |
omap24xx: fix compile error with new binutils (#11072)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30798 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/omap24xx/patches-3.1/210-omap2-kexec-rewrite.patch')
| -rw-r--r-- | target/linux/omap24xx/patches-3.1/210-omap2-kexec-rewrite.patch | 5 |
1 files changed, 2 insertions, 3 deletions
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 0c26af2ab1..f341051c46 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 @@ |