Merge branch 'bsym' into for-next

Conflicts:
	arch/arm/kernel/head.S

diff --cc arch/arm/kernel/entry-common.S
Simple merge

diff --cc arch/arm/kernel/head-nommu.S
Simple merge

diff --cc arch/arm/kernel/head.S
index e13c9cb2e99fa236d2a4650228cafa182558c23f,ab3c478aaced815577ebf4dbca01b70784517bad..bd755d97e459d77ff05cc8a1264f336c58c1b598
--- 1/arch/arm/kernel/head.S
--- 2/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@@ -148,13 -136,8 +148,13 @@@ ENTRY(stext
         */
        ldr     r13, =__mmap_switched           @ address to jump to after
                                                @ mmu has been enabled
-       adr     lr, BSYM(1f)                    @ return (PIC) address
+       badr    lr, 1f                          @ return (PIC) address
 +#ifdef CONFIG_ARM_LPAE
 +      mov     r5, #0                          @ high TTBR0
 +      mov     r8, r4, lsr #12                 @ TTBR1 is swapper_pg_dir pfn
 +#else
        mov     r8, r4                          @ set TTBR1 to swapper_pg_dir
 +#endif
        ldr     r12, [r10, #PROCINFO_INITFUNC]
        add     r12, r12, r10
        ret     r12
@@@ -362,9 -346,9 +362,9 @@@ __turn_mmu_on_loc
  
  #if defined(CONFIG_SMP)
        .text
 -ENTRY(secondary_startup_arm)
        .arm
-  THUMB(       adr     r9, BSYM(1f)    )       @ Kernel is entered in ARM.
 +ENTRY(secondary_startup_arm)
+  THUMB(       badr    r9, 1f          )       @ Kernel is entered in ARM.
   THUMB(       bx      r9              )       @ If this is a Thumb-2 kernel,
   THUMB(       .thumb                  )       @ switch to Thumb now.
   THUMB(1:                     )
@@@ -397,10 -381,10 +397,10 @@@ ENTRY(secondary_startup
        adr     r4, __secondary_data
        ldmia   r4, {r5, r7, r12}               @ address to jump to after
        sub     lr, r4, r5                      @ mmu has been enabled
 -      ldr     r4, [r7, lr]                    @ get secondary_data.pgdir
 -      add     r7, r7, #4
 -      ldr     r8, [r7, lr]                    @ get secondary_data.swapper_pg_dir
 +      add     r3, r7, lr
 +      ldrd    r4, [r3, #0]                    @ get secondary_data.pgdir
 +      ldr     r8, [r3, #8]                    @ get secondary_data.swapper_pg_dir
-       adr     lr, BSYM(__enable_mmu)          @ return address
+       badr    lr, __enable_mmu                @ return address
        mov     r13, r12                        @ __secondary_switched address
        ldr     r12, [r10, #PROCINFO_INITFUNC]
        add     r12, r12, r10                   @ initialise processor