Gentoo Archives: gentoo-commits

From: Mike Pagano <mpagano@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/linux-patches:4.18 commit in: /
Date: Wed, 14 Nov 2018 11:37:58
Message-Id: 1542195382.66eba0794237f1a37a335313e9923fac9ae5c0f7.mpagano@gentoo
1 commit: 66eba0794237f1a37a335313e9923fac9ae5c0f7
2 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 18 18:13:21 2018 +0000
4 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 14 11:36:22 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=66eba079
7
8 Linux patch 4.18.3
9
10 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
11
12 0000_README | 4 ++++
13 1002_linux-4.18.3.patch | 37 +++++++++++++++++++++++++++++++++++++
14 2 files changed, 41 insertions(+)
15
16 diff --git a/0000_README b/0000_README
17 index f72e2ad..c313d8e 100644
18 --- a/0000_README
19 +++ b/0000_README
20 @@ -51,6 +51,10 @@ Patch: 1001_linux-4.18.2.patch
21 From: http://www.kernel.org
22 Desc: Linux 4.18.2
23
24 +Patch: 1002_linux-4.18.3.patch
25 +From: http://www.kernel.org
26 +Desc: Linux 4.18.3
27 +
28 Patch: 1500_XATTR_USER_PREFIX.patch
29 From: https://bugs.gentoo.org/show_bug.cgi?id=470644
30 Desc: Support for namespace user.pax.* on tmpfs.
31
32 diff --git a/1002_linux-4.18.3.patch b/1002_linux-4.18.3.patch
33 new file mode 100644
34 index 0000000..62abf0a
35 --- /dev/null
36 +++ b/1002_linux-4.18.3.patch
37 @@ -0,0 +1,37 @@
38 +diff --git a/Makefile b/Makefile
39 +index fd409a0fd4e1..e2bd815f24eb 100644
40 +--- a/Makefile
41 ++++ b/Makefile
42 +@@ -1,7 +1,7 @@
43 + # SPDX-License-Identifier: GPL-2.0
44 + VERSION = 4
45 + PATCHLEVEL = 18
46 +-SUBLEVEL = 2
47 ++SUBLEVEL = 3
48 + EXTRAVERSION =
49 + NAME = Merciless Moray
50 +
51 +diff --git a/arch/x86/include/asm/pgtable-invert.h b/arch/x86/include/asm/pgtable-invert.h
52 +index 44b1203ece12..a0c1525f1b6f 100644
53 +--- a/arch/x86/include/asm/pgtable-invert.h
54 ++++ b/arch/x86/include/asm/pgtable-invert.h
55 +@@ -4,9 +4,18 @@
56 +
57 + #ifndef __ASSEMBLY__
58 +
59 ++/*
60 ++ * A clear pte value is special, and doesn't get inverted.
61 ++ *
62 ++ * Note that even users that only pass a pgprot_t (rather
63 ++ * than a full pte) won't trigger the special zero case,
64 ++ * because even PAGE_NONE has _PAGE_PROTNONE | _PAGE_ACCESSED
65 ++ * set. So the all zero case really is limited to just the
66 ++ * cleared page table entry case.
67 ++ */
68 + static inline bool __pte_needs_invert(u64 val)
69 + {
70 +- return !(val & _PAGE_PRESENT);
71 ++ return val && !(val & _PAGE_PRESENT);
72 + }
73 +
74 + /* Get a mask to xor with the page table entry to get the correct pfn. */