Gentoo Archives: gentoo-commits

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