From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 12 Jun 2015 20:18:38 +0000 (+0100)
Subject: Merge branch 'bsym' into for-next
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=05c9ca8843cdf688275df891d512e204359717c5;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Merge branch 'bsym' into for-next

Conflicts:
	arch/arm/kernel/head.S
---

05c9ca8843cdf688275df891d512e204359717c5
diff --cc arch/arm/kernel/head.S
index e13c9cb2e99f,ab3c478aaced..bd755d97e459
--- a/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
 +ENTRY(secondary_startup_arm)
-  THUMB(	adr	r9, BSYM(1f)	)	@ Kernel is entered in 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