xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	arch/arm/include/asm/uaccess.h

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
This commit is contained in:
Russell King
2018-08-13 16:28:50 +01:00
parent afc9f65e01 001a30c4d0 a3c0f84765
commit c61b466d4f
16 changed files with 105 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/include/asm/assembler.h
View File

@@ -460,6 +460,10 @@ THUMB( orr \reg , \reg , #PSR_T_BIT )
adds \tmp, \addr, #\size - 1
sbcccs \tmp, \tmp, \limit
bcs \bad
#ifdef CONFIG_CPU_SPECTRE
movcs \addr, #0
csdb
#endif
#endif
.endm