Guest User

Untitled

a guest
Feb 25th, 2014
214
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 16.17 KB | None | 0 0
  1. commit d426ae50f44dd74cf138bfd3f16cac3c535de134
  2. Author: Arnd Bergmann <[email protected]>
  3. Date:   Mon May 20 23:15:49 2013 +0200
  4.  
  5.     [HACK] ARM: build kernels larger than 32MB
  6.    
  7.     If the kernel binary size exceeds 32MB, we have to build with -mlong-calls,
  8.     but that isn't enough for the various direct calls from assembler, which
  9.     this tries to turn into "long" calling conventions as well, badly.
  10.    
  11.     This patch breaks stuff at run-time, because I'm basically clueless
  12.     about ARM assembly, but can probably serve as a starting point for
  13.     someone who understands what they are doing, and it gets the kernel to
  14.     build.
  15.    
  16.     Signed-off-by: Arnd Bergmann <[email protected]>
  17.  
  18. diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
  19. index b08886b..e1f4849 100644
  20. --- a/arch/arm/Kconfig
  21. +++ b/arch/arm/Kconfig
  22. @@ -40,7 +40,7 @@ config ARM
  23.     select HAVE_EFFICIENT_UNALIGNED_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && MMU
  24.     select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL)
  25.     select HAVE_FUNCTION_GRAPH_TRACER if (!THUMB2_KERNEL)
  26. -   select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
  27. +   select HAVE_FUNCTION_TRACER if (!XIP_KERNEL) && BROKEN
  28.     select HAVE_GENERIC_DMA_COHERENT
  29.     select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7))
  30.     select HAVE_IDE if PCI || ISA || PCMCIA
  31. diff --git a/arch/arm/include/asm/div64.h b/arch/arm/include/asm/div64.h
  32. index 191ada6..e1af28a 100644
  33. --- a/arch/arm/include/asm/div64.h
  34. +++ b/arch/arm/include/asm/div64.h
  35. @@ -38,7 +38,7 @@
  36.         __asmeq("%1", "r2")             \
  37.         __asmeq("%2", "r0")             \
  38.         __asmeq("%3", "r4")             \
  39. -       "bl __do_div64"             \
  40. +       ""/*"bl __do_div64"*/               \
  41.         : "=r" (__rem), "=r" (__res)            \
  42.         : "r" (__n), "r" (__base)           \
  43.         : "ip", "lr", "cc");                \
  44. diff --git a/arch/arm/include/asm/entry-macro-multi.S b/arch/arm/include/asm/entry-macro-multi.S
  45. index 88d6181..adfc287 100644
  46. --- a/arch/arm/include/asm/entry-macro-multi.S
  47. +++ b/arch/arm/include/asm/entry-macro-multi.S
  48. @@ -11,7 +11,7 @@
  49.     @ routine called with r0 = irq number, r1 = struct pt_regs *
  50.     @
  51.     adrne   lr, BSYM(1b)
  52. -   bne asm_do_IRQ
  53. +   ldrne   pc, =asm_do_IRQ
  54.  
  55.  #ifdef CONFIG_SMP
  56.     /*
  57. diff --git a/arch/arm/include/asm/word-at-a-time.h b/arch/arm/include/asm/word-at-a-time.h
  58. index a6d0a29..87e1122 100644
  59. --- a/arch/arm/include/asm/word-at-a-time.h
  60. +++ b/arch/arm/include/asm/word-at-a-time.h
  61. @@ -82,7 +82,7 @@ static inline unsigned long load_unaligned_zeropad(const void *addr)
  62.  #else
  63.     "   lsl %0, %0, %1\n"
  64.  #endif
  65. -   "   b   2b\n"
  66. +   "   ldr pc, =2b\n"
  67.     "   .popsection\n"
  68.     "   .pushsection __ex_table,\"a\"\n"
  69.     "   .align  3\n"
  70. diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
  71. index 1879e8d..c2223aa 100644
  72. --- a/arch/arm/kernel/entry-armv.S
  73. +++ b/arch/arm/kernel/entry-armv.S
  74. @@ -221,7 +221,9 @@ ENDPROC(__irq_svc)
  75.  #ifdef CONFIG_PREEMPT
  76.  svc_preempt:
  77.     mov r8, lr
  78. -1: bl  preempt_schedule_irq        @ irq en/disable is done inside
  79. +1: ldr ip, =preempt_schedule_irq       @ irq en/disable is done inside
  80. +   mov lr, pc
  81. +   mov pc, ip
  82.     ldr r0, [tsk, #TI_FLAGS]        @ get new tasks TI_FLAGS
  83.     tst r0, #_TIF_NEED_RESCHED
  84.     moveq   pc, r8              @ go again
  85. diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S
  86. index c96ecac..196b880 100644
  87. --- a/arch/arm/kernel/head-common.S
  88. +++ b/arch/arm/kernel/head-common.S
  89. @@ -128,7 +128,7 @@ __mmap_switched_data:
  90.  ENTRY(lookup_processor_type)
  91.     stmfd   sp!, {r4 - r6, r9, lr}
  92.     mov r9, r0
  93. -   bl  __lookup_processor_type
  94. +   //bl    __lookup_processor_type
  95.     mov r0, r5
  96.     ldmfd   sp!, {r4 - r6, r9, pc}
  97.  ENDPROC(lookup_processor_type)
  98. diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
  99. index f5f381d..ce67932 100644
  100. --- a/arch/arm/kernel/head.S
  101. +++ b/arch/arm/kernel/head.S
  102. @@ -441,7 +441,7 @@ __enable_mmu:
  103.     mcr p15, 0, r5, c3, c0, 0       @ load domain access register
  104.     mcr p15, 0, r4, c2, c0, 0       @ load page table pointer
  105.  #endif
  106. -   b   __turn_mmu_on
  107. +   ldr pc, =__turn_mmu_on
  108.  ENDPROC(__enable_mmu)
  109.  
  110.  /*
  111. diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
  112. index 7bcee5c..f931886 100644
  113. --- a/arch/arm/kernel/vmlinux.lds.S
  114. +++ b/arch/arm/kernel/vmlinux.lds.S
  115. @@ -96,14 +96,14 @@ SECTIONS
  116.             *(.exception.text)
  117.             __exception_text_end = .;
  118.             IRQENTRY_TEXT
  119. +#ifdef CONFIG_MMU
  120. +           *(.fixup)
  121. +#endif
  122.             TEXT_TEXT
  123.             SCHED_TEXT
  124.             LOCK_TEXT
  125.             KPROBES_TEXT
  126.             IDMAP_TEXT
  127. -#ifdef CONFIG_MMU
  128. -           *(.fixup)
  129. -#endif
  130.             *(.gnu.warning)
  131.             *(.glue_7)
  132.             *(.glue_7t)
  133. diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S
  134. index d1a2d05..43125af2 100644
  135. --- a/arch/arm/mm/proc-arm1020.S
  136. +++ b/arch/arm/mm/proc-arm1020.S
  137. @@ -519,7 +519,7 @@ __arm1020_proc_info:
  138.     .long   PMD_TYPE_SECT | \
  139.         PMD_SECT_AP_WRITE | \
  140.         PMD_SECT_AP_READ
  141. -   b   __arm1020_setup
  142. +   ldr pc, =__arm1020_setup
  143.     .long   cpu_arch_name
  144.     .long   cpu_elf_name
  145.     .long   HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB
  146. diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S
  147. index 9d89405..fc26063 100644
  148. --- a/arch/arm/mm/proc-arm1020e.S
  149. +++ b/arch/arm/mm/proc-arm1020e.S
  150. @@ -479,7 +479,7 @@ __arm1020e_proc_info:
  151.         PMD_BIT4 | \
  152.         PMD_SECT_AP_WRITE | \
  153.         PMD_SECT_AP_READ
  154. -   b   __arm1020e_setup
  155. +   ldr pc, =__arm1020e_setup
  156.     .long   cpu_arch_name
  157.     .long   cpu_elf_name
  158.     .long   HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB | HWCAP_EDSP
  159. diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S
  160. index 6f01a0a..1792437 100644
  161. --- a/arch/arm/mm/proc-arm1022.S
  162. +++ b/arch/arm/mm/proc-arm1022.S
  163. @@ -462,7 +462,7 @@ __arm1022_proc_info:
  164.         PMD_BIT4 | \
  165.         PMD_SECT_AP_WRITE | \
  166.         PMD_SECT_AP_READ
  167. -   b   __arm1022_setup
  168. +   ldr pc, =__arm1022_setup
  169.     .long   cpu_arch_name
  170.     .long   cpu_elf_name
  171.     .long   HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB | HWCAP_EDSP
  172. diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S
  173. index 4799a24..242abce 100644
  174. --- a/arch/arm/mm/proc-arm1026.S
  175. +++ b/arch/arm/mm/proc-arm1026.S
  176. @@ -456,7 +456,7 @@ __arm1026_proc_info:
  177.         PMD_BIT4 | \
  178.         PMD_SECT_AP_WRITE | \
  179.         PMD_SECT_AP_READ
  180. -   b   __arm1026_setup
  181. +   ldr pc, =__arm1026_setup
  182.     .long   cpu_arch_name
  183.     .long   cpu_elf_name
  184.     .long   HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP|HWCAP_JAVA
  185. diff --git a/arch/arm/mm/proc-arm740.S b/arch/arm/mm/proc-arm740.S
  186. index 9b0ae90..81a2ec1 100644
  187. --- a/arch/arm/mm/proc-arm740.S
  188. +++ b/arch/arm/mm/proc-arm740.S
  189. @@ -139,7 +139,7 @@ __arm740_proc_info:
  190.     .long   0xfffffff0
  191.     .long   0
  192.     .long   0
  193. -   b   __arm740_setup
  194. +   ldr pc, =__arm740_setup
  195.     .long   cpu_arch_name
  196.     .long   cpu_elf_name
  197.     .long   HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB | HWCAP_26BIT
  198. diff --git a/arch/arm/mm/proc-arm7tdmi.S b/arch/arm/mm/proc-arm7tdmi.S
  199. index f6cc3f6..6a6fc37 100644
  200. --- a/arch/arm/mm/proc-arm7tdmi.S
  201. +++ b/arch/arm/mm/proc-arm7tdmi.S
  202. @@ -86,7 +86,7 @@ __\name\()_proc_info:
  203.         .long   \cpu_mask
  204.         .long   0
  205.         .long   0
  206. -       b   __arm7tdmi_setup
  207. +       ldr pc, =__arm7tdmi_setup
  208.         .long   cpu_arch_name
  209.         .long   cpu_elf_name
  210.         .long   HWCAP_SWP | HWCAP_26BIT | ( \extra_hwcaps )
  211. diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S
  212. index 549557d..11c0e96 100644
  213. --- a/arch/arm/mm/proc-arm920.S
  214. +++ b/arch/arm/mm/proc-arm920.S
  215. @@ -406,7 +406,7 @@ ENTRY(cpu_arm920_do_resume)
  216.     mcr p15, 0, r5, c3, c0, 0   @ Domain ID
  217.     mcr p15, 0, r1, c2, c0, 0   @ TTB address
  218.     mov r0, r6          @ control register
  219. -   b   cpu_resume_mmu
  220. +   ldr pc, =cpu_resume_mmu
  221.  ENDPROC(cpu_arm920_do_resume)
  222.  #endif
  223.  
  224. @@ -464,7 +464,7 @@ __arm920_proc_info:
  225.         PMD_BIT4 | \
  226.         PMD_SECT_AP_WRITE | \
  227.         PMD_SECT_AP_READ
  228. -   b   __arm920_setup
  229. +   ldr pc, =__arm920_setup
  230.     .long   cpu_arch_name
  231.     .long   cpu_elf_name
  232.     .long   HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB
  233. diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S
  234. index 2a758b0..5b9e30d 100644
  235. --- a/arch/arm/mm/proc-arm922.S
  236. +++ b/arch/arm/mm/proc-arm922.S
  237. @@ -388,6 +388,7 @@ ENTRY(cpu_arm922_set_pte_ext)
  238.  #endif /* CONFIG_MMU */
  239.     mov pc, lr
  240.  
  241. +   __INIT
  242.     .type   __arm922_setup, #function
  243.  __arm922_setup:
  244.     mov r0, #0
  245. @@ -442,7 +443,7 @@ __arm922_proc_info:
  246.         PMD_BIT4 | \
  247.         PMD_SECT_AP_WRITE | \
  248.         PMD_SECT_AP_READ
  249. -   b   __arm922_setup
  250. +   ldr pc, =__arm922_setup
  251.     .long   cpu_arch_name
  252.     .long   cpu_elf_name
  253.     .long   HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB
  254. diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S
  255. index 97448c3..aabb182 100644
  256. --- a/arch/arm/mm/proc-arm925.S
  257. +++ b/arch/arm/mm/proc-arm925.S
  258. @@ -509,7 +509,7 @@ __\name\()_proc_info:
  259.         PMD_BIT4 | \
  260.         PMD_SECT_AP_WRITE | \
  261.         PMD_SECT_AP_READ
  262. -   b   __arm925_setup
  263. +   ldr pc, =__arm925_setup
  264.     .long   cpu_arch_name
  265.     .long   cpu_elf_name
  266.     .long   HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB
  267. diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S
  268. index 0f098f4..babb021 100644
  269. --- a/arch/arm/mm/proc-arm926.S
  270. +++ b/arch/arm/mm/proc-arm926.S
  271. @@ -421,7 +421,7 @@ ENTRY(cpu_arm926_do_resume)
  272.     mcr p15, 0, r5, c3, c0, 0   @ Domain ID
  273.     mcr p15, 0, r1, c2, c0, 0   @ TTB address
  274.     mov r0, r6          @ control register
  275. -   b   cpu_resume_mmu
  276. +   ldr pc, =cpu_resume_mmu
  277.  ENDPROC(cpu_arm926_do_resume)
  278.  #endif
  279.  
  280. @@ -490,7 +490,7 @@ __arm926_proc_info:
  281.         PMD_BIT4 | \
  282.         PMD_SECT_AP_WRITE | \
  283.         PMD_SECT_AP_READ
  284. -   b   __arm926_setup
  285. +   ldr pc, =__arm926_setup
  286.     .long   cpu_arch_name
  287.     .long   cpu_elf_name
  288.     .long   HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP|HWCAP_JAVA
  289. diff --git a/arch/arm/mm/proc-arm940.S b/arch/arm/mm/proc-arm940.S
  290. index 1c39a70..01903ad 100644
  291. --- a/arch/arm/mm/proc-arm940.S
  292. +++ b/arch/arm/mm/proc-arm940.S
  293. @@ -361,7 +361,7 @@ __arm940_proc_info:
  294.     .long   0x41009400
  295.     .long   0xff00fff0
  296.     .long   0
  297. -   b   __arm940_setup
  298. +   ldr pc, =__arm940_setup
  299.     .long   cpu_arch_name
  300.     .long   cpu_elf_name
  301.     .long   HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB
  302. diff --git a/arch/arm/mm/proc-arm946.S b/arch/arm/mm/proc-arm946.S
  303. index 0289cd9..484632c 100644
  304. --- a/arch/arm/mm/proc-arm946.S
  305. +++ b/arch/arm/mm/proc-arm946.S
  306. @@ -416,7 +416,7 @@ __arm946_proc_info:
  307.     .long   0xff00fff0
  308.     .long   0
  309.     .long   0
  310. -   b   __arm946_setup
  311. +   ldr pc, =__arm946_setup
  312.     .long   cpu_arch_name
  313.     .long   cpu_elf_name
  314.     .long   HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB
  315. diff --git a/arch/arm/mm/proc-arm9tdmi.S b/arch/arm/mm/proc-arm9tdmi.S
  316. index f51197b..92e4df9 100644
  317. --- a/arch/arm/mm/proc-arm9tdmi.S
  318. +++ b/arch/arm/mm/proc-arm9tdmi.S
  319. @@ -79,7 +79,7 @@ __\name\()_proc_info:
  320.         .long   \cpu_mask
  321.         .long   0
  322.         .long   0
  323. -       b   __arm9tdmi_setup
  324. +       ldr pc, =__arm9tdmi_setup
  325.         .long   cpu_arch_name
  326.         .long   cpu_elf_name
  327.         .long   HWCAP_SWP | HWCAP_THUMB | HWCAP_26BIT
  328. diff --git a/arch/arm/mm/proc-fa526.S b/arch/arm/mm/proc-fa526.S
  329. index 2dfc0f1..00ad689 100644
  330. --- a/arch/arm/mm/proc-fa526.S
  331. +++ b/arch/arm/mm/proc-fa526.S
  332. @@ -206,7 +206,7 @@ __fa526_proc_info:
  333.         PMD_BIT4 | \
  334.         PMD_SECT_AP_WRITE | \
  335.         PMD_SECT_AP_READ
  336. -   b   __fa526_setup
  337. +   ldr pc, =__fa526_setup
  338.     .long   cpu_arch_name
  339.     .long   cpu_elf_name
  340.     .long   HWCAP_SWP | HWCAP_HALF
  341. diff --git a/arch/arm/mm/proc-feroceon.S b/arch/arm/mm/proc-feroceon.S
  342. index db79b62..fb11d74 100644
  343. --- a/arch/arm/mm/proc-feroceon.S
  344. +++ b/arch/arm/mm/proc-feroceon.S
  345. @@ -536,7 +536,7 @@ ENTRY(cpu_feroceon_do_resume)
  346.     mcr p15, 0, r5, c3, c0, 0   @ Domain ID
  347.     mcr p15, 0, r1, c2, c0, 0   @ TTB address
  348.     mov r0, r6          @ control register
  349. -   b   cpu_resume_mmu
  350. +   ldr pc, =cpu_resume_mmu
  351.  ENDPROC(cpu_feroceon_do_resume)
  352.  #endif
  353.  
  354. @@ -601,7 +601,8 @@ __\name\()_proc_info:
  355.         PMD_BIT4 | \
  356.         PMD_SECT_AP_WRITE | \
  357.         PMD_SECT_AP_READ
  358. -   b   __feroceon_setup
  359. +   ldr pc, =__feroceon_setup
  360. +   .long __feroceon_setup
  361.     .long   cpu_arch_name
  362.     .long   cpu_elf_name
  363.     .long   HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP
  364. diff --git a/arch/arm/mm/proc-mohawk.S b/arch/arm/mm/proc-mohawk.S
  365. index 40acba5..8f6a61e 100644
  366. --- a/arch/arm/mm/proc-mohawk.S
  367. +++ b/arch/arm/mm/proc-mohawk.S
  368. @@ -379,7 +379,7 @@ ENTRY(cpu_mohawk_do_resume)
  369.     mcr p15, 0, r1, c2, c0, 0   @ translation table base addr
  370.     mcr p15, 0, r8, c1, c0, 1   @ auxiliary control reg
  371.     mov r0, r9          @ control register
  372. -   b   cpu_resume_mmu
  373. +   ldr pc, =cpu_resume_mmu
  374.  ENDPROC(cpu_mohawk_do_resume)
  375.  #endif
  376.  
  377. @@ -443,7 +443,7 @@ __88sv331x_proc_info:
  378.         PMD_BIT4 | \
  379.         PMD_SECT_AP_WRITE | \
  380.         PMD_SECT_AP_READ
  381. -   b   __mohawk_setup
  382. +   ldr pc, =__mohawk_setup
  383.     .long   cpu_arch_name
  384.     .long   cpu_elf_name
  385.     .long   HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP
  386. diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S
  387. index c45319c..261516b 100644
  388. --- a/arch/arm/mm/proc-sa110.S
  389. +++ b/arch/arm/mm/proc-sa110.S
  390. @@ -213,7 +213,7 @@ __sa110_proc_info:
  391.     .long   PMD_TYPE_SECT | \
  392.         PMD_SECT_AP_WRITE | \
  393.         PMD_SECT_AP_READ
  394. -   b   __sa110_setup
  395. +   ldr pc, =__sa110_setup
  396.     .long   cpu_arch_name
  397.     .long   cpu_elf_name
  398.     .long   HWCAP_SWP | HWCAP_HALF | HWCAP_26BIT | HWCAP_FAST_MULT
  399. diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S
  400. index 09d241a..16cadf6 100644
  401. --- a/arch/arm/mm/proc-sa1100.S
  402. +++ b/arch/arm/mm/proc-sa1100.S
  403. @@ -194,7 +194,7 @@ ENTRY(cpu_sa1100_do_resume)
  404.     mcr p15, 0, r1, c2, c0, 0       @ translation table base addr
  405.     mcr p15, 0, r5, c13, c0, 0      @ PID
  406.     mov r0, r6              @ control register
  407. -   b   cpu_resume_mmu
  408. +   ldr pc, =cpu_resume_mmu
  409.  ENDPROC(cpu_sa1100_do_resume)
  410.  #endif
  411.  
  412. @@ -257,7 +257,7 @@ __\name\()_proc_info:
  413.     .long   PMD_TYPE_SECT | \
  414.         PMD_SECT_AP_WRITE | \
  415.         PMD_SECT_AP_READ
  416. -   b   __sa1100_setup
  417. +   ldr pc, =__sa1100_setup
  418.     .long   cpu_arch_name
  419.     .long   cpu_elf_name
  420.     .long   HWCAP_SWP | HWCAP_HALF | HWCAP_26BIT | HWCAP_FAST_MULT
  421. diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
  422. index 32b3558..72d8a9d 100644
  423. --- a/arch/arm/mm/proc-v6.S
  424. +++ b/arch/arm/mm/proc-v6.S
  425. @@ -172,7 +172,7 @@ ENTRY(cpu_v6_do_resume)
  426.     mcr p15, 0, r8, c1, c0, 2   @ co-processor access control
  427.     mcr p15, 0, ip, c7, c5, 4   @ ISB
  428.     mov r0, r9          @ control register
  429. -   b   cpu_resume_mmu
  430. +   ldr pc, =cpu_resume_mmu
  431.  ENDPROC(cpu_v6_do_resume)
  432.  #endif
  433.  
  434. @@ -287,7 +287,7 @@ __v6_proc_info:
  435.         PMD_SECT_XN | \
  436.         PMD_SECT_AP_WRITE | \
  437.         PMD_SECT_AP_READ
  438. -   b   __v6_setup
  439. +   ldr pc, =__v6_setup
  440.     .long   cpu_arch_name
  441.     .long   cpu_elf_name
  442.     /* See also feat_v6_fixup() for HWCAP_TLS */
  443. diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
  444. index 195731d..6a7fbca 100644
  445. --- a/arch/arm/mm/proc-v7.S
  446. +++ b/arch/arm/mm/proc-v7.S
  447. @@ -148,7 +148,7 @@ ENTRY(cpu_v7_do_resume)
  448.     isb
  449.     dsb
  450.     mov r0, r8          @ control register
  451. -   b   cpu_resume_mmu
  452. +   ldr pc, =cpu_resume_mmu
  453.  ENDPROC(cpu_v7_do_resume)
  454.  #endif
  455.  
  456. @@ -204,7 +204,7 @@ __v7_ca15mp_setup:
  457.     orreq   r0, r0, r10         @ Enable CPU-specific SMP bits
  458.     mcreq   p15, 0, r0, c1, c0, 1
  459.  #endif
  460. -   b   __v7_setup
  461. +   ldr pc, =__v7_setup
  462.  
  463.  __v7_pj4b_setup:
  464.  #ifdef CONFIG_CPU_PJ4B
  465. @@ -417,7 +417,7 @@ __v7_setup_stack:
  466.             PMD_SECT_AF | PMD_FLAGS_UP | \mm_mmuflags)
  467.     .long   PMD_TYPE_SECT | PMD_SECT_AP_WRITE | \
  468.         PMD_SECT_AP_READ | PMD_SECT_AF | \io_mmuflags
  469. -   W(b)    \initfunc
  470. +   ldr pc, =\initfunc
  471.     .long   cpu_arch_name
  472.     .long   cpu_elf_name
  473.     .long   HWCAP_SWP | HWCAP_HALF | HWCAP_THUMB | HWCAP_FAST_MULT | \
  474. diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S
  475. index dc16458..1989899 100644
  476. --- a/arch/arm/mm/proc-xsc3.S
  477. +++ b/arch/arm/mm/proc-xsc3.S
  478. @@ -442,7 +442,7 @@ ENTRY(cpu_xsc3_do_resume)
  479.     mcr p15, 0, r1, c2, c0, 0   @ translation table base addr
  480.     mcr p15, 0, r8, c1, c0, 1   @ auxiliary control reg
  481.     mov r0, r9          @ control register
  482. -   b   cpu_resume_mmu
  483. +   ldr pc, =cpu_resume_mmu
  484.  ENDPROC(cpu_xsc3_do_resume)
  485.  #endif
  486.  
  487. @@ -514,7 +514,7 @@ __\name\()_proc_info:
  488.     .long   PMD_TYPE_SECT | \
  489.         PMD_SECT_AP_WRITE | \
  490.         PMD_SECT_AP_READ
  491. -   b   __xsc3_setup
  492. +   ldr pc, =__xsc3_setup
  493.     .long   cpu_arch_name
  494.     .long   cpu_elf_name
  495.     .long   HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP
  496. diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S
  497. index d19b1cf..163a28f 100644
  498. --- a/arch/arm/mm/proc-xscale.S
  499. +++ b/arch/arm/mm/proc-xscale.S
  500. @@ -554,7 +554,7 @@ ENTRY(cpu_xscale_do_resume)
  501.     mcr p15, 0, r1, c2, c0, 0   @ translation table base addr
  502.     mcr p15, 0, r8, c1, c1, 0   @ auxiliary control reg
  503.     mov r0, r9          @ control register
  504. -   b   cpu_resume_mmu
  505. +   ldr pc, =cpu_resume_mmu
  506.  ENDPROC(cpu_xscale_do_resume)
  507.  #endif
  508.  
  509. @@ -627,7 +627,7 @@ __\name\()_proc_info:
  510.     .long   PMD_TYPE_SECT | \
  511.         PMD_SECT_AP_WRITE | \
  512.         PMD_SECT_AP_READ
  513. -   b   __xscale_setup
  514. +   ldr pc, =__xscale_setup
  515.     .long   cpu_arch_name
  516.     .long   cpu_elf_name
  517.     .long   HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP
Advertisement
Add Comment
Please, Sign In to add comment