Evolution-X-Devices/kernel_xiaomi_tulip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 4.4.150 into android-4.4

Browse Source 
Changes in 4.4.150
	x86/speculation/l1tf: Exempt zeroed PTEs from inversion
	Linux 4.4.150

Change-Id: I2dfd6e160998ae2f55f3b7621df62e96a4511f7c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2018-08-18 11:35:52 +02:00
parent f76bdbdd51 7dc18ebc31
commit 5541782ce2
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -1,6 +1,6 @@
VERSION = 4
PATCHLEVEL = 4
SUBLEVEL = 149
SUBLEVEL = 150
EXTRAVERSION =
NAME = Blurry Fish Butt

11
arch/x86/include/asm/pgtable-invert.h
View File

@@ -4,9 +4,18 @@
#ifndef __ASSEMBLY__
/*
* A clear pte value is special, and doesn't get inverted.
*
* Note that even users that only pass a pgprot_t (rather
* than a full pte) won't trigger the special zero case,
* because even PAGE_NONE has _PAGE_PROTNONE | _PAGE_ACCESSED
* set. So the all zero case really is limited to just the
* cleared page table entry case.
*/
static inline bool __pte_needs_invert(u64 val)
{
return !(val & _PAGE_PRESENT);
return val && !(val & _PAGE_PRESENT);
}
/* Get a mask to xor with the page table entry to get the correct pfn. */