Merge branches 'debug-choice', 'devel-stable' and 'misc' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 5 Sep 2013 09:34:15 +0000 (10:34 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 5 Sep 2013 09:34:15 +0000 (10:34 +0100)
1  2  3  4 
arch/arm/Kconfig
arch/arm/include/asm/spinlock.h
arch/arm/kernel/setup.c
arch/arm/kernel/smp.c
arch/arm/kvm/mmu.c
arch/arm/mm/cache-l2x0.c
arch/arm/mm/mmu.c
arch/arm/mm/proc-v7.S

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@@@ -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)