Merge branches 'fixes', 'misc' and 'spectre' into for-linus

[sfrench/cifs-2.6.git] / arch / arm / include / asm / assembler.h

diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
index 0cd4dccbae788626ddd277376d1dc78c719a9ff2..b17ee03d280b6ff9ff706f04ab4d3be57f20bfe8 100644 (file)
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
@@ -460,6 +460,10 @@ THUMB(     orr     \reg , \reg , #PSR_T_BIT        )
        adds    \tmp, \addr, #\size - 1
        sbcccs  \tmp, \tmp, \limit
        bcs     \bad
        adds    \tmp, \addr, #\size - 1
        sbcccs  \tmp, \tmp, \limit
        bcs     \bad

+#ifdef CONFIG_CPU_SPECTRE
+       movcs   \addr, #0
+       csdb
+#endif

 #endif
        .endm
 
 #endif
        .endm