From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 5 Sep 2013 09:34:15 +0000 (+0100)
Subject: Merge branches 'debug-choice', 'devel-stable' and 'misc' into for-linus
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=141b97433d77e39ac3ac111a7b3852192035259c;p=deliverable%2Flinux.git

Merge branches 'debug-choice', 'devel-stable' and 'misc' into for-linus
---

141b97433d77e39ac3ac111a7b3852192035259c
diff --cc arch/arm/mm/proc-v7.S
index 73398bcf9bd8,73398bcf9bd8,0b5462a941a6,e7d45d529a21..c63d9bdee51e
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@@@@ -75,15 -75,15 -75,15 -75,14 +75,15 @@@@@ ENTRY(cpu_v7_do_idle
    ENDPROC(cpu_v7_do_idle)
    
    ENTRY(cpu_v7_dcache_clean_area)
   -	ALT_SMP(mov	pc, lr)			@ MP extensions imply L1 PTW
   -	ALT_UP(W(nop))
   -	dcache_line_size r2, r3
   -1:	mcr	p15, 0, r0, c7, c10, 1		@ clean D entry
   +	ALT_SMP(W(nop))			@ MP extensions imply L1 PTW
   +	ALT_UP_B(1f)
   +	mov	pc, lr
   +1:	dcache_line_size r2, r3
   +2:	mcr	p15, 0, r0, c7, c10, 1		@ clean D entry
    	add	r0, r0, r2
    	subs	r1, r1, r2
   -	bhi	1b
   -	dsb
   +	bhi	2b
--  	dsb
++ +	dsb	ishst
    	mov	pc, lr
    ENDPROC(cpu_v7_dcache_clean_area)