From: notaz <notasas@gmail.com>
Date: Sun, 13 Apr 2014 16:21:38 +0000 (+0300)
Subject: Merge branch 'stable-3.2' into pandora-3.2
X-Git-Tag: sz_161~56
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=7a99657f9dc3c00998e6313295832687b70ed52f

Merge branch 'stable-3.2' into pandora-3.2

Conflicts:
	arch/arm/mm/proc-v7.S
---

7a99657f9dc3c00998e6313295832687b70ed52f
diff --cc arch/arm/mm/proc-v7.S
index 69bcd4a57811,19d21ff27b0e..c540f534fe60
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@@ -245,21 -368,20 +245,21 @@@ __v7_setup
  
  3:	mov	r10, #0
  	mcr	p15, 0, r10, c7, c5, 0		@ I+BTB cache invalidate
- 	dsb
  #ifdef CONFIG_MMU
  	mcr	p15, 0, r10, c8, c7, 0		@ invalidate I + D TLBs
 -	mcr	p15, 0, r10, c2, c0, 2		@ TTB control register
 -	ALT_SMP(orr	r4, r4, #TTB_FLAGS_SMP)
 -	ALT_UP(orr	r4, r4, #TTB_FLAGS_UP)
 -	ALT_SMP(orr	r8, r8, #TTB_FLAGS_SMP)
 -	ALT_UP(orr	r8, r8, #TTB_FLAGS_UP)
 -	mcr	p15, 0, r8, c2, c0, 1		@ load TTB1
 +	v7_ttb_setup r10, r4, r8, r5		@ TTBCR, TTBRx setup
  	ldr	r5, =PRRR			@ PRRR
  	ldr	r6, =NMRR			@ NMRR
  	mcr	p15, 0, r5, c10, c2, 0		@ write PRRR
  	mcr	p15, 0, r6, c10, c2, 1		@ write NMRR
  #endif
+ 	dsb					@ Complete invalidations
 +
 +#ifdef CONFIG_USER_PMON
 +	mov	r0, #1
 +	mcr	p15, 0, r0, c9, c14, 0
 +#endif
 +
  #ifndef CONFIG_ARM_THUMBEE
  	mrc	p15, 0, r0, c0, c1, 0		@ read ID_PFR0 for ThumbEE
  	and	r0, r0, #(0xf << 12)		@ ThumbEE enabled field