Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- commit d426ae50f44dd74cf138bfd3f16cac3c535de134
- Author: Arnd Bergmann <[email protected]>
- Date: Mon May 20 23:15:49 2013 +0200
- [HACK] ARM: build kernels larger than 32MB
- If the kernel binary size exceeds 32MB, we have to build with -mlong-calls,
- but that isn't enough for the various direct calls from assembler, which
- this tries to turn into "long" calling conventions as well, badly.
- This patch breaks stuff at run-time, because I'm basically clueless
- about ARM assembly, but can probably serve as a starting point for
- someone who understands what they are doing, and it gets the kernel to
- build.
- Signed-off-by: Arnd Bergmann <[email protected]>
- diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
- index b08886b..e1f4849 100644
- --- a/arch/arm/Kconfig
- +++ b/arch/arm/Kconfig
- @@ -40,7 +40,7 @@ config ARM
- select HAVE_EFFICIENT_UNALIGNED_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && MMU
- select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL)
- select HAVE_FUNCTION_GRAPH_TRACER if (!THUMB2_KERNEL)
- - select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
- + select HAVE_FUNCTION_TRACER if (!XIP_KERNEL) && BROKEN
- select HAVE_GENERIC_DMA_COHERENT
- select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7))
- select HAVE_IDE if PCI || ISA || PCMCIA
- diff --git a/arch/arm/include/asm/div64.h b/arch/arm/include/asm/div64.h
- index 191ada6..e1af28a 100644
- --- a/arch/arm/include/asm/div64.h
- +++ b/arch/arm/include/asm/div64.h
- @@ -38,7 +38,7 @@
- __asmeq("%1", "r2") \
- __asmeq("%2", "r0") \
- __asmeq("%3", "r4") \
- - "bl __do_div64" \
- + ""/*"bl __do_div64"*/ \
- : "=r" (__rem), "=r" (__res) \
- : "r" (__n), "r" (__base) \
- : "ip", "lr", "cc"); \
- diff --git a/arch/arm/include/asm/entry-macro-multi.S b/arch/arm/include/asm/entry-macro-multi.S
- index 88d6181..adfc287 100644
- --- a/arch/arm/include/asm/entry-macro-multi.S
- +++ b/arch/arm/include/asm/entry-macro-multi.S
- @@ -11,7 +11,7 @@
- @ routine called with r0 = irq number, r1 = struct pt_regs *
- @
- adrne lr, BSYM(1b)
- - bne asm_do_IRQ
- + ldrne pc, =asm_do_IRQ
- #ifdef CONFIG_SMP
- /*
- diff --git a/arch/arm/include/asm/word-at-a-time.h b/arch/arm/include/asm/word-at-a-time.h
- index a6d0a29..87e1122 100644
- --- a/arch/arm/include/asm/word-at-a-time.h
- +++ b/arch/arm/include/asm/word-at-a-time.h
- @@ -82,7 +82,7 @@ static inline unsigned long load_unaligned_zeropad(const void *addr)
- #else
- " lsl %0, %0, %1\n"
- #endif
- - " b 2b\n"
- + " ldr pc, =2b\n"
- " .popsection\n"
- " .pushsection __ex_table,\"a\"\n"
- " .align 3\n"
- diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
- index 1879e8d..c2223aa 100644
- --- a/arch/arm/kernel/entry-armv.S
- +++ b/arch/arm/kernel/entry-armv.S
- @@ -221,7 +221,9 @@ ENDPROC(__irq_svc)
- #ifdef CONFIG_PREEMPT
- svc_preempt:
- mov r8, lr
- -1: bl preempt_schedule_irq @ irq en/disable is done inside
- +1: ldr ip, =preempt_schedule_irq @ irq en/disable is done inside
- + mov lr, pc
- + mov pc, ip
- ldr r0, [tsk, #TI_FLAGS] @ get new tasks TI_FLAGS
- tst r0, #_TIF_NEED_RESCHED
- moveq pc, r8 @ go again
- diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S
- index c96ecac..196b880 100644
- --- a/arch/arm/kernel/head-common.S
- +++ b/arch/arm/kernel/head-common.S
- @@ -128,7 +128,7 @@ __mmap_switched_data:
- ENTRY(lookup_processor_type)
- stmfd sp!, {r4 - r6, r9, lr}
- mov r9, r0
- - bl __lookup_processor_type
- + //bl __lookup_processor_type
- mov r0, r5
- ldmfd sp!, {r4 - r6, r9, pc}
- ENDPROC(lookup_processor_type)
- diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
- index f5f381d..ce67932 100644
- --- a/arch/arm/kernel/head.S
- +++ b/arch/arm/kernel/head.S
- @@ -441,7 +441,7 @@ __enable_mmu:
- mcr p15, 0, r5, c3, c0, 0 @ load domain access register
- mcr p15, 0, r4, c2, c0, 0 @ load page table pointer
- #endif
- - b __turn_mmu_on
- + ldr pc, =__turn_mmu_on
- ENDPROC(__enable_mmu)
- /*
- diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
- index 7bcee5c..f931886 100644
- --- a/arch/arm/kernel/vmlinux.lds.S
- +++ b/arch/arm/kernel/vmlinux.lds.S
- @@ -96,14 +96,14 @@ SECTIONS
- *(.exception.text)
- __exception_text_end = .;
- IRQENTRY_TEXT
- +#ifdef CONFIG_MMU
- + *(.fixup)
- +#endif
- TEXT_TEXT
- SCHED_TEXT
- LOCK_TEXT
- KPROBES_TEXT
- IDMAP_TEXT
- -#ifdef CONFIG_MMU
- - *(.fixup)
- -#endif
- *(.gnu.warning)
- *(.glue_7)
- *(.glue_7t)
- diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S
- index d1a2d05..43125af2 100644
- --- a/arch/arm/mm/proc-arm1020.S
- +++ b/arch/arm/mm/proc-arm1020.S
- @@ -519,7 +519,7 @@ __arm1020_proc_info:
- .long PMD_TYPE_SECT | \
- PMD_SECT_AP_WRITE | \
- PMD_SECT_AP_READ
- - b __arm1020_setup
- + ldr pc, =__arm1020_setup
- .long cpu_arch_name
- .long cpu_elf_name
- .long HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB
- diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S
- index 9d89405..fc26063 100644
- --- a/arch/arm/mm/proc-arm1020e.S
- +++ b/arch/arm/mm/proc-arm1020e.S
- @@ -479,7 +479,7 @@ __arm1020e_proc_info:
- PMD_BIT4 | \
- PMD_SECT_AP_WRITE | \
- PMD_SECT_AP_READ
- - b __arm1020e_setup
- + ldr pc, =__arm1020e_setup
- .long cpu_arch_name
- .long cpu_elf_name
- .long HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB | HWCAP_EDSP
- diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S
- index 6f01a0a..1792437 100644
- --- a/arch/arm/mm/proc-arm1022.S
- +++ b/arch/arm/mm/proc-arm1022.S
- @@ -462,7 +462,7 @@ __arm1022_proc_info:
- PMD_BIT4 | \
- PMD_SECT_AP_WRITE | \
- PMD_SECT_AP_READ
- - b __arm1022_setup
- + ldr pc, =__arm1022_setup
- .long cpu_arch_name
- .long cpu_elf_name
- .long HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB | HWCAP_EDSP
- diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S
- index 4799a24..242abce 100644
- --- a/arch/arm/mm/proc-arm1026.S
- +++ b/arch/arm/mm/proc-arm1026.S
- @@ -456,7 +456,7 @@ __arm1026_proc_info:
- PMD_BIT4 | \
- PMD_SECT_AP_WRITE | \
- PMD_SECT_AP_READ
- - b __arm1026_setup
- + ldr pc, =__arm1026_setup
- .long cpu_arch_name
- .long cpu_elf_name
- .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP|HWCAP_JAVA
- diff --git a/arch/arm/mm/proc-arm740.S b/arch/arm/mm/proc-arm740.S
- index 9b0ae90..81a2ec1 100644
- --- a/arch/arm/mm/proc-arm740.S
- +++ b/arch/arm/mm/proc-arm740.S
- @@ -139,7 +139,7 @@ __arm740_proc_info:
- .long 0xfffffff0
- .long 0
- .long 0
- - b __arm740_setup
- + ldr pc, =__arm740_setup
- .long cpu_arch_name
- .long cpu_elf_name
- .long HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB | HWCAP_26BIT
- diff --git a/arch/arm/mm/proc-arm7tdmi.S b/arch/arm/mm/proc-arm7tdmi.S
- index f6cc3f6..6a6fc37 100644
- --- a/arch/arm/mm/proc-arm7tdmi.S
- +++ b/arch/arm/mm/proc-arm7tdmi.S
- @@ -86,7 +86,7 @@ __\name\()_proc_info:
- .long \cpu_mask
- .long 0
- .long 0
- - b __arm7tdmi_setup
- + ldr pc, =__arm7tdmi_setup
- .long cpu_arch_name
- .long cpu_elf_name
- .long HWCAP_SWP | HWCAP_26BIT | ( \extra_hwcaps )
- diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S
- index 549557d..11c0e96 100644
- --- a/arch/arm/mm/proc-arm920.S
- +++ b/arch/arm/mm/proc-arm920.S
- @@ -406,7 +406,7 @@ ENTRY(cpu_arm920_do_resume)
- mcr p15, 0, r5, c3, c0, 0 @ Domain ID
- mcr p15, 0, r1, c2, c0, 0 @ TTB address
- mov r0, r6 @ control register
- - b cpu_resume_mmu
- + ldr pc, =cpu_resume_mmu
- ENDPROC(cpu_arm920_do_resume)
- #endif
- @@ -464,7 +464,7 @@ __arm920_proc_info:
- PMD_BIT4 | \
- PMD_SECT_AP_WRITE | \
- PMD_SECT_AP_READ
- - b __arm920_setup
- + ldr pc, =__arm920_setup
- .long cpu_arch_name
- .long cpu_elf_name
- .long HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB
- diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S
- index 2a758b0..5b9e30d 100644
- --- a/arch/arm/mm/proc-arm922.S
- +++ b/arch/arm/mm/proc-arm922.S
- @@ -388,6 +388,7 @@ ENTRY(cpu_arm922_set_pte_ext)
- #endif /* CONFIG_MMU */
- mov pc, lr
- + __INIT
- .type __arm922_setup, #function
- __arm922_setup:
- mov r0, #0
- @@ -442,7 +443,7 @@ __arm922_proc_info:
- PMD_BIT4 | \
- PMD_SECT_AP_WRITE | \
- PMD_SECT_AP_READ
- - b __arm922_setup
- + ldr pc, =__arm922_setup
- .long cpu_arch_name
- .long cpu_elf_name
- .long HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB
- diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S
- index 97448c3..aabb182 100644
- --- a/arch/arm/mm/proc-arm925.S
- +++ b/arch/arm/mm/proc-arm925.S
- @@ -509,7 +509,7 @@ __\name\()_proc_info:
- PMD_BIT4 | \
- PMD_SECT_AP_WRITE | \
- PMD_SECT_AP_READ
- - b __arm925_setup
- + ldr pc, =__arm925_setup
- .long cpu_arch_name
- .long cpu_elf_name
- .long HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB
- diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S
- index 0f098f4..babb021 100644
- --- a/arch/arm/mm/proc-arm926.S
- +++ b/arch/arm/mm/proc-arm926.S
- @@ -421,7 +421,7 @@ ENTRY(cpu_arm926_do_resume)
- mcr p15, 0, r5, c3, c0, 0 @ Domain ID
- mcr p15, 0, r1, c2, c0, 0 @ TTB address
- mov r0, r6 @ control register
- - b cpu_resume_mmu
- + ldr pc, =cpu_resume_mmu
- ENDPROC(cpu_arm926_do_resume)
- #endif
- @@ -490,7 +490,7 @@ __arm926_proc_info:
- PMD_BIT4 | \
- PMD_SECT_AP_WRITE | \
- PMD_SECT_AP_READ
- - b __arm926_setup
- + ldr pc, =__arm926_setup
- .long cpu_arch_name
- .long cpu_elf_name
- .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP|HWCAP_JAVA
- diff --git a/arch/arm/mm/proc-arm940.S b/arch/arm/mm/proc-arm940.S
- index 1c39a70..01903ad 100644
- --- a/arch/arm/mm/proc-arm940.S
- +++ b/arch/arm/mm/proc-arm940.S
- @@ -361,7 +361,7 @@ __arm940_proc_info:
- .long 0x41009400
- .long 0xff00fff0
- .long 0
- - b __arm940_setup
- + ldr pc, =__arm940_setup
- .long cpu_arch_name
- .long cpu_elf_name
- .long HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB
- diff --git a/arch/arm/mm/proc-arm946.S b/arch/arm/mm/proc-arm946.S
- index 0289cd9..484632c 100644
- --- a/arch/arm/mm/proc-arm946.S
- +++ b/arch/arm/mm/proc-arm946.S
- @@ -416,7 +416,7 @@ __arm946_proc_info:
- .long 0xff00fff0
- .long 0
- .long 0
- - b __arm946_setup
- + ldr pc, =__arm946_setup
- .long cpu_arch_name
- .long cpu_elf_name
- .long HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB
- diff --git a/arch/arm/mm/proc-arm9tdmi.S b/arch/arm/mm/proc-arm9tdmi.S
- index f51197b..92e4df9 100644
- --- a/arch/arm/mm/proc-arm9tdmi.S
- +++ b/arch/arm/mm/proc-arm9tdmi.S
- @@ -79,7 +79,7 @@ __\name\()_proc_info:
- .long \cpu_mask
- .long 0
- .long 0
- - b __arm9tdmi_setup
- + ldr pc, =__arm9tdmi_setup
- .long cpu_arch_name
- .long cpu_elf_name
- .long HWCAP_SWP | HWCAP_THUMB | HWCAP_26BIT
- diff --git a/arch/arm/mm/proc-fa526.S b/arch/arm/mm/proc-fa526.S
- index 2dfc0f1..00ad689 100644
- --- a/arch/arm/mm/proc-fa526.S
- +++ b/arch/arm/mm/proc-fa526.S
- @@ -206,7 +206,7 @@ __fa526_proc_info:
- PMD_BIT4 | \
- PMD_SECT_AP_WRITE | \
- PMD_SECT_AP_READ
- - b __fa526_setup
- + ldr pc, =__fa526_setup
- .long cpu_arch_name
- .long cpu_elf_name
- .long HWCAP_SWP | HWCAP_HALF
- diff --git a/arch/arm/mm/proc-feroceon.S b/arch/arm/mm/proc-feroceon.S
- index db79b62..fb11d74 100644
- --- a/arch/arm/mm/proc-feroceon.S
- +++ b/arch/arm/mm/proc-feroceon.S
- @@ -536,7 +536,7 @@ ENTRY(cpu_feroceon_do_resume)
- mcr p15, 0, r5, c3, c0, 0 @ Domain ID
- mcr p15, 0, r1, c2, c0, 0 @ TTB address
- mov r0, r6 @ control register
- - b cpu_resume_mmu
- + ldr pc, =cpu_resume_mmu
- ENDPROC(cpu_feroceon_do_resume)
- #endif
- @@ -601,7 +601,8 @@ __\name\()_proc_info:
- PMD_BIT4 | \
- PMD_SECT_AP_WRITE | \
- PMD_SECT_AP_READ
- - b __feroceon_setup
- + ldr pc, =__feroceon_setup
- + .long __feroceon_setup
- .long cpu_arch_name
- .long cpu_elf_name
- .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP
- diff --git a/arch/arm/mm/proc-mohawk.S b/arch/arm/mm/proc-mohawk.S
- index 40acba5..8f6a61e 100644
- --- a/arch/arm/mm/proc-mohawk.S
- +++ b/arch/arm/mm/proc-mohawk.S
- @@ -379,7 +379,7 @@ ENTRY(cpu_mohawk_do_resume)
- mcr p15, 0, r1, c2, c0, 0 @ translation table base addr
- mcr p15, 0, r8, c1, c0, 1 @ auxiliary control reg
- mov r0, r9 @ control register
- - b cpu_resume_mmu
- + ldr pc, =cpu_resume_mmu
- ENDPROC(cpu_mohawk_do_resume)
- #endif
- @@ -443,7 +443,7 @@ __88sv331x_proc_info:
- PMD_BIT4 | \
- PMD_SECT_AP_WRITE | \
- PMD_SECT_AP_READ
- - b __mohawk_setup
- + ldr pc, =__mohawk_setup
- .long cpu_arch_name
- .long cpu_elf_name
- .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP
- diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S
- index c45319c..261516b 100644
- --- a/arch/arm/mm/proc-sa110.S
- +++ b/arch/arm/mm/proc-sa110.S
- @@ -213,7 +213,7 @@ __sa110_proc_info:
- .long PMD_TYPE_SECT | \
- PMD_SECT_AP_WRITE | \
- PMD_SECT_AP_READ
- - b __sa110_setup
- + ldr pc, =__sa110_setup
- .long cpu_arch_name
- .long cpu_elf_name
- .long HWCAP_SWP | HWCAP_HALF | HWCAP_26BIT | HWCAP_FAST_MULT
- diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S
- index 09d241a..16cadf6 100644
- --- a/arch/arm/mm/proc-sa1100.S
- +++ b/arch/arm/mm/proc-sa1100.S
- @@ -194,7 +194,7 @@ ENTRY(cpu_sa1100_do_resume)
- mcr p15, 0, r1, c2, c0, 0 @ translation table base addr
- mcr p15, 0, r5, c13, c0, 0 @ PID
- mov r0, r6 @ control register
- - b cpu_resume_mmu
- + ldr pc, =cpu_resume_mmu
- ENDPROC(cpu_sa1100_do_resume)
- #endif
- @@ -257,7 +257,7 @@ __\name\()_proc_info:
- .long PMD_TYPE_SECT | \
- PMD_SECT_AP_WRITE | \
- PMD_SECT_AP_READ
- - b __sa1100_setup
- + ldr pc, =__sa1100_setup
- .long cpu_arch_name
- .long cpu_elf_name
- .long HWCAP_SWP | HWCAP_HALF | HWCAP_26BIT | HWCAP_FAST_MULT
- diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
- index 32b3558..72d8a9d 100644
- --- a/arch/arm/mm/proc-v6.S
- +++ b/arch/arm/mm/proc-v6.S
- @@ -172,7 +172,7 @@ ENTRY(cpu_v6_do_resume)
- mcr p15, 0, r8, c1, c0, 2 @ co-processor access control
- mcr p15, 0, ip, c7, c5, 4 @ ISB
- mov r0, r9 @ control register
- - b cpu_resume_mmu
- + ldr pc, =cpu_resume_mmu
- ENDPROC(cpu_v6_do_resume)
- #endif
- @@ -287,7 +287,7 @@ __v6_proc_info:
- PMD_SECT_XN | \
- PMD_SECT_AP_WRITE | \
- PMD_SECT_AP_READ
- - b __v6_setup
- + ldr pc, =__v6_setup
- .long cpu_arch_name
- .long cpu_elf_name
- /* See also feat_v6_fixup() for HWCAP_TLS */
- diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
- index 195731d..6a7fbca 100644
- --- a/arch/arm/mm/proc-v7.S
- +++ b/arch/arm/mm/proc-v7.S
- @@ -148,7 +148,7 @@ ENTRY(cpu_v7_do_resume)
- isb
- dsb
- mov r0, r8 @ control register
- - b cpu_resume_mmu
- + ldr pc, =cpu_resume_mmu
- ENDPROC(cpu_v7_do_resume)
- #endif
- @@ -204,7 +204,7 @@ __v7_ca15mp_setup:
- orreq r0, r0, r10 @ Enable CPU-specific SMP bits
- mcreq p15, 0, r0, c1, c0, 1
- #endif
- - b __v7_setup
- + ldr pc, =__v7_setup
- __v7_pj4b_setup:
- #ifdef CONFIG_CPU_PJ4B
- @@ -417,7 +417,7 @@ __v7_setup_stack:
- PMD_SECT_AF | PMD_FLAGS_UP | \mm_mmuflags)
- .long PMD_TYPE_SECT | PMD_SECT_AP_WRITE | \
- PMD_SECT_AP_READ | PMD_SECT_AF | \io_mmuflags
- - W(b) \initfunc
- + ldr pc, =\initfunc
- .long cpu_arch_name
- .long cpu_elf_name
- .long HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB | HWCAP_FAST_MULT | \
- diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S
- index dc16458..1989899 100644
- --- a/arch/arm/mm/proc-xsc3.S
- +++ b/arch/arm/mm/proc-xsc3.S
- @@ -442,7 +442,7 @@ ENTRY(cpu_xsc3_do_resume)
- mcr p15, 0, r1, c2, c0, 0 @ translation table base addr
- mcr p15, 0, r8, c1, c0, 1 @ auxiliary control reg
- mov r0, r9 @ control register
- - b cpu_resume_mmu
- + ldr pc, =cpu_resume_mmu
- ENDPROC(cpu_xsc3_do_resume)
- #endif
- @@ -514,7 +514,7 @@ __\name\()_proc_info:
- .long PMD_TYPE_SECT | \
- PMD_SECT_AP_WRITE | \
- PMD_SECT_AP_READ
- - b __xsc3_setup
- + ldr pc, =__xsc3_setup
- .long cpu_arch_name
- .long cpu_elf_name
- .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP
- diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S
- index d19b1cf..163a28f 100644
- --- a/arch/arm/mm/proc-xscale.S
- +++ b/arch/arm/mm/proc-xscale.S
- @@ -554,7 +554,7 @@ ENTRY(cpu_xscale_do_resume)
- mcr p15, 0, r1, c2, c0, 0 @ translation table base addr
- mcr p15, 0, r8, c1, c1, 0 @ auxiliary control reg
- mov r0, r9 @ control register
- - b cpu_resume_mmu
- + ldr pc, =cpu_resume_mmu
- ENDPROC(cpu_xscale_do_resume)
- #endif
- @@ -627,7 +627,7 @@ __\name\()_proc_info:
- .long PMD_TYPE_SECT | \
- PMD_SECT_AP_WRITE | \
- PMD_SECT_AP_READ
- - b __xscale_setup
- + ldr pc, =__xscale_setup
- .long cpu_arch_name
- .long cpu_elf_name
- .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP
Advertisement
Add Comment
Please, Sign In to add comment