mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-20 02:12:52 +02:00
omap24xx: fix compile error with new binutils (#11072)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30798 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
4eb5b6210d
commit
2f3210027c
@ -2039,7 +2039,7 @@
|
|||||||
VMLINUX_SYMBOL(__entry_text_start) = .; \
|
VMLINUX_SYMBOL(__entry_text_start) = .; \
|
||||||
--- a/arch/arm/kernel/sleep.S
|
--- a/arch/arm/kernel/sleep.S
|
||||||
+++ b/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
|
.ltorg
|
||||||
.align 5
|
.align 5
|
||||||
cpu_resume_turn_mmu_on:
|
cpu_resume_turn_mmu_on:
|
||||||
@ -2049,11 +2049,10 @@
|
|||||||
mov r1, r1
|
mov r1, r1
|
||||||
mov r1, r1
|
mov r1, r1
|
||||||
mov pc, r3 @ jump to virtual address
|
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:
|
cpu_resume_after_mmu:
|
||||||
str r5, [r2, r4, lsl #2] @ restore old mapping
|
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
|
--- a/arch/arm/mach-omap2/io.c
|
||||||
+++ b/arch/arm/mach-omap2/io.c
|
+++ b/arch/arm/mach-omap2/io.c
|
||||||
@@ -36,7 +36,7 @@
|
@@ -36,7 +36,7 @@
|
||||||
|
Loading…
Reference in New Issue
Block a user