leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Russell King
2018-06-05 10:03:27 +01:00
parent 92d44a42af 83d41fb9c0 10573ae547
commit 0ac000e867
41 changed files with 1320 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -447,6 +447,14 @@ THUMB( orr \reg , \reg , #PSR_T_BIT )
.size \name , . - \name
.endm
.macro csdb
#ifdef CONFIG_THUMB2_KERNEL
.inst.w 0xf3af8014
#else
.inst 0xe320f014
#endif
.endm
.macro check_uaccess, addr:req, size:req, limit:req, tmp:req, bad:req
#ifndef CONFIG_CPU_USE_DOMAINS
adds \tmp, \addr, #\size - 1