Annotation of /trunk/kernel-alx/patches-4.9/0221-4.9.122-all-fixes.patch
Parent Directory
| 
Revision Log
Revision 3214 -
(hide annotations)
(download)
Tue Aug 21 12:02:43 2018 UTC (5 years, 9 months ago) by niro
File size: 1035 byte(s)
Tue Aug 21 12:02:43 2018 UTC (5 years, 9 months ago) by niro
File size: 1035 byte(s)
-linux-4.9.122
| 1 | niro | 3214 | diff --git a/Makefile b/Makefile |
| 2 | index e54a126841a9..1f44343a1e04 100644 | ||
| 3 | --- a/Makefile | ||
| 4 | +++ b/Makefile | ||
| 5 | @@ -1,6 +1,6 @@ | ||
| 6 | VERSION = 4 | ||
| 7 | PATCHLEVEL = 9 | ||
| 8 | -SUBLEVEL = 121 | ||
| 9 | +SUBLEVEL = 122 | ||
| 10 | EXTRAVERSION = | ||
| 11 | NAME = Roaring Lionus | ||
| 12 | |||
| 13 | diff --git a/arch/x86/include/asm/pgtable-invert.h b/arch/x86/include/asm/pgtable-invert.h | ||
| 14 | index 44b1203ece12..a0c1525f1b6f 100644 | ||
| 15 | --- a/arch/x86/include/asm/pgtable-invert.h | ||
| 16 | +++ b/arch/x86/include/asm/pgtable-invert.h | ||
| 17 | @@ -4,9 +4,18 @@ | ||
| 18 | |||
| 19 | #ifndef __ASSEMBLY__ | ||
| 20 | |||
| 21 | +/* | ||
| 22 | + * A clear pte value is special, and doesn't get inverted. | ||
| 23 | + * | ||
| 24 | + * Note that even users that only pass a pgprot_t (rather | ||
| 25 | + * than a full pte) won't trigger the special zero case, | ||
| 26 | + * because even PAGE_NONE has _PAGE_PROTNONE | _PAGE_ACCESSED | ||
| 27 | + * set. So the all zero case really is limited to just the | ||
| 28 | + * cleared page table entry case. | ||
| 29 | + */ | ||
| 30 | static inline bool __pte_needs_invert(u64 val) | ||
| 31 | { | ||
| 32 | - return !(val & _PAGE_PRESENT); | ||
| 33 | + return val && !(val & _PAGE_PRESENT); | ||
| 34 | } | ||
| 35 | |||
| 36 | /* Get a mask to xor with the page table entry to get the correct pfn. */ |