Contents of /trunk/kernel-alx/patches-4.14/0164-4.14.65-all-fixes.patch
Parent Directory | Revision Log
Revision 3238 -
(show annotations)
(download)
Fri Nov 9 12:14:58 2018 UTC (5 years, 10 months ago) by niro
File size: 1069 byte(s)
Fri Nov 9 12:14:58 2018 UTC (5 years, 10 months ago) by niro
File size: 1069 byte(s)
-added up to patches-4.14.79
1 | diff --git a/Makefile b/Makefile |
2 | index 025156791e90..7995690ff1aa 100644 |
3 | --- a/Makefile |
4 | +++ b/Makefile |
5 | @@ -1,7 +1,7 @@ |
6 | # SPDX-License-Identifier: GPL-2.0 |
7 | VERSION = 4 |
8 | PATCHLEVEL = 14 |
9 | -SUBLEVEL = 64 |
10 | +SUBLEVEL = 65 |
11 | EXTRAVERSION = |
12 | NAME = Petit Gorille |
13 | |
14 | diff --git a/arch/x86/include/asm/pgtable-invert.h b/arch/x86/include/asm/pgtable-invert.h |
15 | index 44b1203ece12..a0c1525f1b6f 100644 |
16 | --- a/arch/x86/include/asm/pgtable-invert.h |
17 | +++ b/arch/x86/include/asm/pgtable-invert.h |
18 | @@ -4,9 +4,18 @@ |
19 | |
20 | #ifndef __ASSEMBLY__ |
21 | |
22 | +/* |
23 | + * A clear pte value is special, and doesn't get inverted. |
24 | + * |
25 | + * Note that even users that only pass a pgprot_t (rather |
26 | + * than a full pte) won't trigger the special zero case, |
27 | + * because even PAGE_NONE has _PAGE_PROTNONE | _PAGE_ACCESSED |
28 | + * set. So the all zero case really is limited to just the |
29 | + * cleared page table entry case. |
30 | + */ |
31 | static inline bool __pte_needs_invert(u64 val) |
32 | { |
33 | - return !(val & _PAGE_PRESENT); |
34 | + return val && !(val & _PAGE_PRESENT); |
35 | } |
36 | |
37 | /* Get a mask to xor with the page table entry to get the correct pfn. */ |