diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-09-30 17:00:37 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-09-30 17:00:37 +0200 |
| commit | ae4ceee6cb8a8a750cc742bcda7488a4d55cc9c3 (patch) | |
| tree | c72d8e85b60f0fb4107face0b57cbfa8fb05df5b | |
| parent | Build rhel beta kernels too (diff) | |
| download | rhel7-kernel-sanity-patcher-ae4ceee6cb8a8a750cc742bcda7488a4d55cc9c3.tar.xz rhel7-kernel-sanity-patcher-ae4ceee6cb8a8a750cc742bcda7488a4d55cc9c3.zip | |
New patch for linux-3.10.0-1160.el7
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
33 files changed, 174 insertions, 143 deletions
diff --git a/patches/0001-x86-spinlock_types-use-u16-__ticket_t-always.patch b/patches/0001-x86-spinlock_types-use-u16-__ticket_t-always.patch index b237d0f..5b79c66 100644 --- a/patches/0001-x86-spinlock_types-use-u16-__ticket_t-always.patch +++ b/patches/0001-x86-spinlock_types-use-u16-__ticket_t-always.patch @@ -1,7 +1,7 @@ -From 7e358841740ff27d648af5e3d466e35aac6d7c91 Mon Sep 17 00:00:00 2001 +From de6dee868338291ad1640ec1c211a633dc45b479 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 18:44:05 -0600 -Subject: [PATCH 01/32] x86: spinlock_types: use u16 __ticket_t always +Subject: [PATCH 01/33] x86: spinlock_types: use u16 __ticket_t always While it'd be nice to have the smaller type for low-CPU builds, the generic spinlock include hardcodes this at u16 for kABI purposes. For @@ -14,7 +14,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 5 deletions(-) diff --git a/arch/x86/include/asm/spinlock_types.h b/arch/x86/include/asm/spinlock_types.h -index 93560ed8..37182786 100644 +index 93560ed86b79..371827863791 100644 --- a/arch/x86/include/asm/spinlock_types.h +++ b/arch/x86/include/asm/spinlock_types.h @@ -11,13 +11,8 @@ @@ -32,5 +32,5 @@ index 93560ed8..37182786 100644 #define TICKET_LOCK_INC ((__ticket_t)__TICKET_LOCK_INC) -- -2.27.0 +2.28.0 diff --git a/patches/0002-sched-sched_statistics-is-only-defined-for-CONFIG_SC.patch b/patches/0002-sched-sched_statistics-is-only-defined-for-CONFIG_SC.patch index 91fd806..9847de4 100644 --- a/patches/0002-sched-sched_statistics-is-only-defined-for-CONFIG_SC.patch +++ b/patches/0002-sched-sched_statistics-is-only-defined-for-CONFIG_SC.patch @@ -1,7 +1,7 @@ -From 989e22840551c41e27b1967fdc104b27b69ac4ac Mon Sep 17 00:00:00 2001 +From 66b33080b58f9f50a232db027e8c1f1b17180589 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 18:46:30 -0600 -Subject: [PATCH 02/32] sched: sched_statistics is only defined for +Subject: [PATCH 02/33] sched: sched_statistics is only defined for CONFIG_SCHEDSTATS systems Keeping this here results in a compile error on !CONFIG_SCHEDSTATS @@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 2 insertions(+) diff --git a/include/linux/sched.h b/include/linux/sched.h -index 710fd377..581b9b28 100644 +index 18d480780025..a3eac0d783e6 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1864,7 +1864,9 @@ struct task_struct { @@ -27,5 +27,5 @@ index 710fd377..581b9b28 100644 struct prev_cputime prev_cputime; struct vtime vtime; -- -2.27.0 +2.28.0 diff --git a/patches/0003-x86-pud_trans_huge-is-already-defined-generically-fo.patch b/patches/0003-x86-pud_trans_huge-is-already-defined-generically-fo.patch index 0dfd135..4052012 100644 --- a/patches/0003-x86-pud_trans_huge-is-already-defined-generically-fo.patch +++ b/patches/0003-x86-pud_trans_huge-is-already-defined-generically-fo.patch @@ -1,7 +1,7 @@ -From 0ebc9e461331799a91768063028a905f11164df2 Mon Sep 17 00:00:00 2001 +From eb9589e5c7ddcf59702ef7b105eb3a1ef065887a Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 18:48:24 -0600 -Subject: [PATCH 03/32] x86: pud_trans_huge is already defined generically for +Subject: [PATCH 03/33] x86: pud_trans_huge is already defined generically for the nop inline When pud_trans_huge is not required, the stub function is already @@ -17,10 +17,10 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2 files changed, 13 deletions(-) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h -index f19fbbc8..c3d4ed3c 100644 +index 88926233768f..e39cd5a8bd52 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h -@@ -1100,15 +1100,6 @@ static inline int pmd_write(pmd_t pmd) +@@ -1101,15 +1101,6 @@ static inline int pmd_write(pmd_t pmd) return pmd_flags(pmd) & _PAGE_RW; } @@ -37,7 +37,7 @@ index f19fbbc8..c3d4ed3c 100644 static inline pmd_t pmdp_get_and_clear(struct mm_struct *mm, unsigned long addr, pmd_t *pmdp) diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h -index 4cea7a5f..16a4514b 100644 +index 4cea7a5f7095..16a4514b4fec 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -629,10 +629,6 @@ static inline int pmd_trans_splitting(pmd_t pmd) @@ -52,5 +52,5 @@ index 4cea7a5f..16a4514b 100644 { return 0; -- -2.27.0 +2.28.0 diff --git a/patches/0004-huge_mm-remove-trailing-semicolon.patch b/patches/0004-huge_mm-remove-trailing-semicolon.patch index 38fd7a6..a29b8b3 100644 --- a/patches/0004-huge_mm-remove-trailing-semicolon.patch +++ b/patches/0004-huge_mm-remove-trailing-semicolon.patch @@ -1,7 +1,7 @@ -From 701d53d2ecf815fd8263e97e20338e2f33bdf463 Mon Sep 17 00:00:00 2001 +From 39a444e91c578b65bf238982d1782d93c6654676 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 18:50:19 -0600 -Subject: [PATCH 04/32] huge_mm: remove trailing semicolon +Subject: [PATCH 04/33] huge_mm: remove trailing semicolon The trialing semicolon before the function body is invalid C and resulted in a compiler error. This was probably due to a copy and paste @@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h -index 26ec9824..45af11b9 100644 +index 12d5f1aec45e..b608e46a3b50 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -362,7 +362,7 @@ static inline int pud_trans_huge_lock(pud_t *pud, struct vm_area_struct *vma, @@ -26,5 +26,5 @@ index 26ec9824..45af11b9 100644 return 0; } -- -2.27.0 +2.28.0 diff --git a/patches/0005-mm-pass-in-correct-zero-gup_flags-argument.patch b/patches/0005-mm-pass-in-correct-zero-gup_flags-argument.patch index 2ae873d..06c36fb 100644 --- a/patches/0005-mm-pass-in-correct-zero-gup_flags-argument.patch +++ b/patches/0005-mm-pass-in-correct-zero-gup_flags-argument.patch @@ -1,7 +1,7 @@ -From 19667231f4fd4fd0bed55a344d9c4e3fceb5b65f Mon Sep 17 00:00:00 2001 +From 0d92adcd4d33f8194f03cd64667f01f42752125e Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 18:51:36 -0600 -Subject: [PATCH 05/32] mm: pass in correct zero gup_flags argument +Subject: [PATCH 05/33] mm: pass in correct zero gup_flags argument The outer-function, get_user_pages_longterm, does not take a gup_flags argument, which means we should pass it onwards here as 0, rather than @@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/mm.h b/include/linux/mm.h -index 6832964c..0b9b3545 100644 +index 6832964c2934..0b9b3545c657 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1422,7 +1422,7 @@ static inline long get_user_pages_longterm(unsigned long start, @@ -26,5 +26,5 @@ index 6832964c..0b9b3545 100644 #endif /* CONFIG_FS_DAX */ -- -2.27.0 +2.28.0 diff --git a/patches/0006-x86-do-not-evaluate-sometimes-undefined-_PAGE_BIT_SW.patch b/patches/0006-x86-do-not-evaluate-sometimes-undefined-_PAGE_BIT_SW.patch index 89ae488..3144a8a 100644 --- a/patches/0006-x86-do-not-evaluate-sometimes-undefined-_PAGE_BIT_SW.patch +++ b/patches/0006-x86-do-not-evaluate-sometimes-undefined-_PAGE_BIT_SW.patch @@ -1,7 +1,7 @@ -From 3d99a21b076ac7e1169f561a1ef00a7997dda71a Mon Sep 17 00:00:00 2001 +From 58d4fb961436e227168d60812e8b5d023f6eead7 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 18:53:11 -0600 -Subject: [PATCH 06/32] x86: do not evaluate sometimes-undefined +Subject: [PATCH 06/33] x86: do not evaluate sometimes-undefined _PAGE_BIT_SWP_SOFT_DIRTY In certain configurations, _PAGE_BIT_SWP_SOFT_DIRTY is undefined, @@ -14,7 +14,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h -index e857a2c2..c47e99e1 100644 +index e857a2c26004..c47e99e1be90 100644 --- a/arch/x86/include/asm/pgtable_types.h +++ b/arch/x86/include/asm/pgtable_types.h @@ -133,7 +133,7 @@ @@ -27,5 +27,5 @@ index e857a2c2..c47e99e1 100644 #endif #if _PAGE_BIT_FILE == _PAGE_BIT_PROTNONE -- -2.27.0 +2.28.0 diff --git a/patches/0007-mm-include-sched.h-for-task_struct-usage.patch b/patches/0007-mm-include-sched.h-for-task_struct-usage.patch index b10e4f9..8ff1fd6 100644 --- a/patches/0007-mm-include-sched.h-for-task_struct-usage.patch +++ b/patches/0007-mm-include-sched.h-for-task_struct-usage.patch @@ -1,7 +1,7 @@ -From 156caea64d5be4b404eb2785b948d9616eebd5dc Mon Sep 17 00:00:00 2001 +From 80da0f64facbff694801fbae4f299b7bd0ac8725 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 18:55:05 -0600 -Subject: [PATCH 07/32] mm: include sched.h for task_struct usage +Subject: [PATCH 07/33] mm: include sched.h for task_struct usage Functions in here dereference current, which means we need to include linux/sched.h to avoid compilation errors. @@ -12,7 +12,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 1 insertion(+) diff --git a/include/linux/mm.h b/include/linux/mm.h -index 0b9b3545..7dfb104b 100644 +index 0b9b3545c657..7dfb104b53d7 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -24,6 +24,7 @@ @@ -24,5 +24,5 @@ index 0b9b3545..7dfb104b 100644 struct mempolicy; struct anon_vma; -- -2.27.0 +2.28.0 diff --git a/patches/0008-pgtable-properly-ifdef-out-second-definition-of-pud_.patch b/patches/0008-pgtable-properly-ifdef-out-second-definition-of-pud_.patch index 13994ab..43c0dcf 100644 --- a/patches/0008-pgtable-properly-ifdef-out-second-definition-of-pud_.patch +++ b/patches/0008-pgtable-properly-ifdef-out-second-definition-of-pud_.patch @@ -1,7 +1,7 @@ -From 2c11893f05f0d0c4eabd84ed000338deb585879a Mon Sep 17 00:00:00 2001 +From ae48ab16817e5faf4b2cc5bdd358eae88ea09db4 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 18:57:32 -0600 -Subject: [PATCH 08/32] pgtable: properly ifdef out second definition of +Subject: [PATCH 08/33] pgtable: properly ifdef out second definition of pud_write There's a conflicting definition in include/linux/pgtable.h, which is @@ -14,7 +14,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h -index 16a4514b..8c9a8d63 100644 +index 16a4514b4fec..8c9a8d63692a 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -640,7 +640,7 @@ static inline int pmd_write(pmd_t pmd) @@ -27,5 +27,5 @@ index 16a4514b..8c9a8d63 100644 { BUG(); -- -2.27.0 +2.28.0 diff --git a/patches/0009-x86-fault-do-not-define-trace-function-for-CONFIG_TR.patch b/patches/0009-x86-fault-do-not-define-trace-function-for-CONFIG_TR.patch index a07bb55..3b24730 100644 --- a/patches/0009-x86-fault-do-not-define-trace-function-for-CONFIG_TR.patch +++ b/patches/0009-x86-fault-do-not-define-trace-function-for-CONFIG_TR.patch @@ -1,7 +1,7 @@ -From c8a2a2388fcdb12808bb41292ece75935c068856 Mon Sep 17 00:00:00 2001 +From 210cd60d993e023a293b403eb4886dfb8c8acbc9 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 19:01:48 -0600 -Subject: [PATCH 09/32] x86: fault: do not define trace function for +Subject: [PATCH 09/33] x86: fault: do not define trace function for !CONFIG_TRACING Do not define the page fault tracing function for !CONFIG_TRACING, when @@ -14,7 +14,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 2 insertions(+) diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c -index f7d79eae..4698dedc 100644 +index f7d79eae0b13..4698dedc7071 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -1379,6 +1379,7 @@ static void trace_page_fault_entries(struct pt_regs *regs, @@ -31,5 +31,5 @@ index f7d79eae..4698dedc 100644 } +#endif -- -2.27.0 +2.28.0 diff --git a/patches/0010-fs-only-call-out-to-emergency_thaw_bdev-with-CONFIG_.patch b/patches/0010-fs-only-call-out-to-emergency_thaw_bdev-with-CONFIG_.patch index 9290fe4..d5a9ec2 100644 --- a/patches/0010-fs-only-call-out-to-emergency_thaw_bdev-with-CONFIG_.patch +++ b/patches/0010-fs-only-call-out-to-emergency_thaw_bdev-with-CONFIG_.patch @@ -1,7 +1,7 @@ -From 67770b701d2331bedc5cdc9bad9c5c592ab1aa96 Mon Sep 17 00:00:00 2001 +From d1ad32d88546dbd9681b3ad9eaa47010ca6133b3 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 19:04:26 -0600 -Subject: [PATCH 10/32] fs: only call out to emergency_thaw_bdev with +Subject: [PATCH 10/33] fs: only call out to emergency_thaw_bdev with CONFIG_BLOCK The function emergency_thaw_bdev is only declared when CONFIG_BLOCK is @@ -14,10 +14,10 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 2 insertions(+) diff --git a/fs/super.c b/fs/super.c -index 1c8da6f1..b883d6c3 100644 +index 500fdcfd7ef6..8bf6b7eb023b 100644 --- a/fs/super.c +++ b/fs/super.c -@@ -854,7 +854,9 @@ static void do_thaw_all(struct work_struct *work) +@@ -856,7 +856,9 @@ static void do_thaw_all(struct work_struct *work) spin_unlock(&sb_lock); down_write(&sb->s_umount); if (sb->s_root && sb->s_flags & MS_BORN) { @@ -28,5 +28,5 @@ index 1c8da6f1..b883d6c3 100644 } else { up_write(&sb->s_umount); -- -2.27.0 +2.28.0 diff --git a/patches/0011-fs-forward-declare-struct-bio-to-avoid-compiler-warn.patch b/patches/0011-fs-forward-declare-struct-bio-to-avoid-compiler-warn.patch index bb5129f..d9f3f0d 100644 --- a/patches/0011-fs-forward-declare-struct-bio-to-avoid-compiler-warn.patch +++ b/patches/0011-fs-forward-declare-struct-bio-to-avoid-compiler-warn.patch @@ -1,7 +1,7 @@ -From 5e82bbaa7e814cfaf1749c7e4d57e818543ed0ae Mon Sep 17 00:00:00 2001 +From 09529b5e55ded368d3bfd5391900349c5607e5bf Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 19:06:05 -0600 -Subject: [PATCH 11/32] fs: forward declare struct bio to avoid compiler +Subject: [PATCH 11/33] fs: forward declare struct bio to avoid compiler warning Otherwise the compiler warns because the first usage of this struct is @@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 1 insertion(+) diff --git a/fs/internal.h b/fs/internal.h -index cf73dc06..9c633659 100644 +index cf73dc065f85..9c633659d4ba 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -18,6 +18,7 @@ struct iomap_ops; @@ -25,5 +25,5 @@ index cf73dc06..9c633659 100644 /* * block_dev.c -- -2.27.0 +2.28.0 diff --git a/patches/0012-sched-sched_info-requires-CONFIG_SCHEDSTATS.patch b/patches/0012-sched-sched_info-requires-CONFIG_SCHEDSTATS.patch index 15b54d0..d61dd21 100644 --- a/patches/0012-sched-sched_info-requires-CONFIG_SCHEDSTATS.patch +++ b/patches/0012-sched-sched_info-requires-CONFIG_SCHEDSTATS.patch @@ -1,7 +1,7 @@ -From 126cc237edee8f7da9d878442abea290586dc417 Mon Sep 17 00:00:00 2001 +From 081f0cca55dbb1e577ac66ccd018052f6448451d Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 19:08:57 -0600 -Subject: [PATCH 12/32] sched: sched_info requires CONFIG_SCHEDSTATS +Subject: [PATCH 12/33] sched: sched_info requires CONFIG_SCHEDSTATS Because the sched_info symbol is only defined for CONFIG_SCHEDSTATS kernels, we shouldn't include it inside other structs in this case. @@ -12,7 +12,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h -index f5842fb3..ac44dd36 100644 +index f5842fb36718..ac44dd36e782 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -733,11 +733,12 @@ struct rq { @@ -30,5 +30,5 @@ index f5842fb3..ac44dd36 100644 /* sys_sched_yield() stats */ unsigned int yld_count; -- -2.27.0 +2.28.0 diff --git a/patches/0013-workqueue-remove-call-to-non-existent-pr_cont_pool_i.patch b/patches/0013-workqueue-remove-call-to-non-existent-pr_cont_pool_i.patch index 0d948d2..a974950 100644 --- a/patches/0013-workqueue-remove-call-to-non-existent-pr_cont_pool_i.patch +++ b/patches/0013-workqueue-remove-call-to-non-existent-pr_cont_pool_i.patch @@ -1,7 +1,7 @@ -From 45cf4d29e60295358377e9df940339bba597acb4 Mon Sep 17 00:00:00 2001 +From ecc84438f2032d302f2ecabb53676d79eb0669cb Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 19:09:50 -0600 -Subject: [PATCH 13/32] workqueue: remove call to non-existent +Subject: [PATCH 13/33] workqueue: remove call to non-existent pr_cont_pool_info The function pr_cont_pool_info is called, but does not exist anywhere in @@ -14,7 +14,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 1 deletion(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c -index 5379e3f1..34830e03 100644 +index 5379e3f1af70..34830e034038 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -5338,7 +5338,6 @@ static void wq_watchdog_timer_fn(unsigned long data) @@ -26,5 +26,5 @@ index 5379e3f1..34830e03 100644 jiffies_to_msecs(jiffies - pool_ts) / 1000); } -- -2.27.0 +2.28.0 diff --git a/patches/0014-mm-oom_kill-task_uid-is-a-direct-uid_t.patch b/patches/0014-mm-oom_kill-task_uid-is-a-direct-uid_t.patch index 7b0ee70..5e10667 100644 --- a/patches/0014-mm-oom_kill-task_uid-is-a-direct-uid_t.patch +++ b/patches/0014-mm-oom_kill-task_uid-is-a-direct-uid_t.patch @@ -1,7 +1,7 @@ -From 6dd666383d9828ae2e72bebf5669cc56fd3061d5 Mon Sep 17 00:00:00 2001 +From b13f03d8cd55339f2f634e6fe5e1e136d4d0084f Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> -Date: Sun, 24 May 2020 19:11:45 -0600 -Subject: [PATCH 14/32] mm: oom_kill: task_uid is a direct uid_t +Date: Wed, 30 Sep 2020 16:26:51 +0200 +Subject: [PATCH 14/33] mm: oom_kill: task_uid is a direct uid_t This is code that presumes that uid_t is some sort of union type, which it isn't, so the val member doesn't exist. Instead, use the return value @@ -13,11 +13,11 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/oom_kill.c b/mm/oom_kill.c -index 4bef2b0a..80000c45 100644 +index b7599778fa18..ce0a46393308 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c -@@ -505,7 +505,7 @@ void oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order, - mm = victim->mm; +@@ -529,7 +529,7 @@ void oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order, + set_tsk_thread_flag(victim, TIF_MEMDIE); pr_err("Killed process %d (%s), UID %d, total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB, shmem-rss:%lukB\n", task_pid_nr(victim), victim->comm, - task_uid(victim).val, K(victim->mm->total_vm), @@ -26,5 +26,5 @@ index 4bef2b0a..80000c45 100644 K(get_mm_counter(victim->mm, MM_FILEPAGES)), K(get_mm_counter(victim->mm, MM_SHMEMPAGES))); -- -2.27.0 +2.28.0 diff --git a/patches/0015-crash_dump-always-include-UAPI-header.patch b/patches/0015-crash_dump-always-include-UAPI-header.patch index 2fc6604..dc8b5f0 100644 --- a/patches/0015-crash_dump-always-include-UAPI-header.patch +++ b/patches/0015-crash_dump-always-include-UAPI-header.patch @@ -1,7 +1,7 @@ -From 12f4079fa258c80d77d3fc4bc887c87061d1103e Mon Sep 17 00:00:00 2001 +From e912aaf105bfcbdcb3a3c2cc292c9f1f2606a356 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 19:14:25 -0600 -Subject: [PATCH 15/32] crash_dump: always include UAPI header +Subject: [PATCH 15/33] crash_dump: always include UAPI header The uapi header has important constants, regardless of whether or not CONFIG_CRASH_DUMP is enabled, so always include it. @@ -12,7 +12,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/crash_dump.h b/include/linux/crash_dump.h -index ade593b8..a313492b 100644 +index ade593b819d8..a313492bf2e8 100644 --- a/include/linux/crash_dump.h +++ b/include/linux/crash_dump.h @@ -1,11 +1,11 @@ @@ -29,5 +29,5 @@ index ade593b8..a313492b 100644 #define ELFCORE_ADDR_MAX (-1ULL) #define ELFCORE_ADDR_ERR (-2ULL) -- -2.27.0 +2.28.0 diff --git a/patches/0016-huge_mm-define-trans_huge_mmu_gather_count-stub-func.patch b/patches/0016-huge_mm-define-trans_huge_mmu_gather_count-stub-func.patch index b6dd3b4..c873f9b 100644 --- a/patches/0016-huge_mm-define-trans_huge_mmu_gather_count-stub-func.patch +++ b/patches/0016-huge_mm-define-trans_huge_mmu_gather_count-stub-func.patch @@ -1,7 +1,7 @@ -From 66b3e11d281d5d9e528a13e8144711b78d9504ac Mon Sep 17 00:00:00 2001 +From 44fa036030209e6a8449a8f6c9fd2dd948093475 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 19:17:10 -0600 -Subject: [PATCH 16/32] huge_mm: define trans_huge_mmu_gather_count stub +Subject: [PATCH 16/33] huge_mm: define trans_huge_mmu_gather_count stub function When huge pages are not enabled, swap still needs to have a stub version @@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 5 insertions(+) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h -index 45af11b9..a7256eb1 100644 +index b608e46a3b50..2863450175a0 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -382,6 +382,11 @@ static inline struct page *trans_huge_page_release_decode(struct page *page) @@ -29,5 +29,5 @@ index 45af11b9..a7256eb1 100644 extern bool is_huge_zero_page_release(struct page *page); -- -2.27.0 +2.28.0 diff --git a/patches/0017-workqueue-remove-call-to-non-existent-show_workqueue.patch b/patches/0017-workqueue-remove-call-to-non-existent-show_workqueue.patch index 89c3a33..7fc8cce 100644 --- a/patches/0017-workqueue-remove-call-to-non-existent-show_workqueue.patch +++ b/patches/0017-workqueue-remove-call-to-non-existent-show_workqueue.patch @@ -1,7 +1,7 @@ -From 2c2f8bd9b402b4b95edb77d4ed70ba0c7a07fc68 Mon Sep 17 00:00:00 2001 +From 3013e7720054356da5a51621954564f7d9db977e Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 19:18:34 -0600 -Subject: [PATCH 17/32] workqueue: remove call to non-existent +Subject: [PATCH 17/33] workqueue: remove call to non-existent show_workqueue_state The function show_workqueue_state is called, but does not exist anywhere @@ -14,7 +14,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 3 deletions(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c -index 34830e03..873cb111 100644 +index 34830e034038..873cb1115145 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -5345,9 +5345,6 @@ static void wq_watchdog_timer_fn(unsigned long data) @@ -28,5 +28,5 @@ index 34830e03..873cb111 100644 mod_timer(&wq_watchdog_timer, jiffies + thresh); } -- -2.27.0 +2.28.0 diff --git a/patches/0018-x86-kaiser_enabled-isn-t-always-defined.patch b/patches/0018-x86-kaiser_enabled-isn-t-always-defined.patch index 05429cd..0788e83 100644 --- a/patches/0018-x86-kaiser_enabled-isn-t-always-defined.patch +++ b/patches/0018-x86-kaiser_enabled-isn-t-always-defined.patch @@ -1,7 +1,7 @@ -From 4f57c39fe783c453db2cfce3f344596541eb1cff Mon Sep 17 00:00:00 2001 +From 8258fd4244740abbf9c9386681dcde960b30a7c3 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 19:20:19 -0600 -Subject: [PATCH 18/32] x86: kaiser_enabled isn't always defined +Subject: [PATCH 18/33] x86: kaiser_enabled isn't always defined This symbol only exists when CONFIG_PAGE_TABLE_ISOLATION is set, so don't use it otherwise. @@ -12,10 +12,10 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 2 insertions(+) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c -index 4f81e6de..c85d0534 100644 +index eed1e0c03c19..c33396b4a3e0 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c -@@ -1137,8 +1137,10 @@ static ssize_t cpu_show_common(struct device *dev, struct device_attribute *attr +@@ -1236,8 +1236,10 @@ static ssize_t cpu_show_common(struct device *dev, struct device_attribute *attr switch (bug) { case X86_BUG_CPU_MELTDOWN: @@ -27,5 +27,5 @@ index 4f81e6de..c85d0534 100644 break; -- -2.27.0 +2.28.0 diff --git a/patches/0019-mm-slub-use-correct-arguments-for-fallback-function.patch b/patches/0019-mm-slub-use-correct-arguments-for-fallback-function.patch index 554654f..aff0a3e 100644 --- a/patches/0019-mm-slub-use-correct-arguments-for-fallback-function.patch +++ b/patches/0019-mm-slub-use-correct-arguments-for-fallback-function.patch @@ -1,7 +1,7 @@ -From c54163e705d528f1cbe91b610b1e371c49bf0795 Mon Sep 17 00:00:00 2001 +From f62f44ccfd3cc315a2877391373f4ac7921fe40e Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 19:23:58 -0600 -Subject: [PATCH 19/32] mm: slub: use correct arguments for fallback function +Subject: [PATCH 19/33] mm: slub: use correct arguments for fallback function The stub function used different arguments from the real function, causing compiler errors when used. The fix is to simply use the same @@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/slub.c b/mm/slub.c -index 02ecdfa5..6170edf5 100644 +index 02ecdfa5e1fd..6170edf5bfac 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1397,7 +1397,7 @@ static inline int slab_pre_alloc_hook(struct kmem_cache *s, gfp_t flags) @@ -26,5 +26,5 @@ index 02ecdfa5..6170edf5 100644 static inline void slab_free_hook(struct kmem_cache *s, void *x) {} -- -2.27.0 +2.28.0 diff --git a/patches/0020-x86-mshyperv-don-t-touch-kexec-symbols-without-CONFI.patch b/patches/0020-x86-mshyperv-don-t-touch-kexec-symbols-without-CONFI.patch index 27cf15f..84adfd3 100644 --- a/patches/0020-x86-mshyperv-don-t-touch-kexec-symbols-without-CONFI.patch +++ b/patches/0020-x86-mshyperv-don-t-touch-kexec-symbols-without-CONFI.patch @@ -1,7 +1,7 @@ -From 924ce0996518177b8389510992d6bf66a9b4f792 Mon Sep 17 00:00:00 2001 +From f1ecb543fffe2fd334f932fb43c548612941d023 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 19:27:37 -0600 -Subject: [PATCH 20/32] x86: mshyperv: don't touch kexec symbols without +Subject: [PATCH 20/33] x86: mshyperv: don't touch kexec symbols without CONFIG_KEXEC_CORE These symbols aren't defined without CONFIG_KEXEC_CORE, so factor it out of @@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 6 insertions(+) diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c -index a5aef8cf..b5da6dbe 100644 +index 666ba5ca39a9..fbb096c54e35 100644 --- a/arch/x86/kernel/cpu/mshyperv.c +++ b/arch/x86/kernel/cpu/mshyperv.c @@ -142,7 +142,11 @@ EXPORT_SYMBOL_GPL(hv_remove_crash_handler); @@ -39,5 +39,5 @@ index a5aef8cf..b5da6dbe 100644 -- -2.27.0 +2.28.0 diff --git a/patches/0021-rh_taint-don-t-dereference-struct-module-without-CON.patch b/patches/0021-rh_taint-don-t-dereference-struct-module-without-CON.patch index d71fd1d..7316727 100644 --- a/patches/0021-rh_taint-don-t-dereference-struct-module-without-CON.patch +++ b/patches/0021-rh_taint-don-t-dereference-struct-module-without-CON.patch @@ -1,7 +1,7 @@ -From 815e5dd000a138f24fa412b98c31b425343ae9a6 Mon Sep 17 00:00:00 2001 +From b5108aaf36105894a1412f73788afc3bfedd3071 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 19:28:07 -0600 -Subject: [PATCH 21/32] rh_taint: don't dereference struct module without +Subject: [PATCH 21/33] rh_taint: don't dereference struct module without CONFIG_MODULE This structure isn't defined for !CONFIG_MODULE, so don't try to use it. @@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2 files changed, 6 insertions(+) diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h -index 560ca53a..3425b352 100644 +index 560ca53a75fa..3425b352eac9 100644 --- a/include/linux/moduleloader.h +++ b/include/linux/moduleloader.h @@ -45,7 +45,9 @@ static inline int apply_relocate(Elf_Shdr *sechdrs, @@ -27,7 +27,7 @@ index 560ca53a..3425b352 100644 } #endif diff --git a/kernel/rh_taint.c b/kernel/rh_taint.c -index 22f03243..bbd7f8a1 100644 +index 22f032431c96..bbd7f8a1ab29 100644 --- a/kernel/rh_taint.c +++ b/kernel/rh_taint.c @@ -61,14 +61,18 @@ void mark_tech_preview(const char *msg, struct module *mod) @@ -50,5 +50,5 @@ index 22f03243..bbd7f8a1 100644 } EXPORT_SYMBOL(mark_tech_preview); -- -2.27.0 +2.28.0 diff --git a/patches/0022-bpf-define-trace_bpf_jit_free-stub-for-when-BPF-isn-.patch b/patches/0022-bpf-define-trace_bpf_jit_free-stub-for-when-BPF-isn-.patch index bd5d381..a18c4e8 100644 --- a/patches/0022-bpf-define-trace_bpf_jit_free-stub-for-when-BPF-isn-.patch +++ b/patches/0022-bpf-define-trace_bpf_jit_free-stub-for-when-BPF-isn-.patch @@ -1,7 +1,7 @@ -From ff6c880804ffcca3f59f1b843cd3becf1d46120b Mon Sep 17 00:00:00 2001 +From e30cb86791cc4a67c38aa3d0385d5e58e2026034 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 19:31:18 -0600 -Subject: [PATCH 22/32] bpf: define trace_bpf_jit_free stub for when BPF isn't +Subject: [PATCH 22/33] bpf: define trace_bpf_jit_free stub for when BPF isn't compiled in Configuration options that exclude BPF mean we need to have a stub @@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 4 insertions(+) diff --git a/include/linux/filter.h b/include/linux/filter.h -index 9f8aa2fe..de43bcf9 100644 +index 9f8aa2fe7f2f..de43bcf9c6f3 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -779,6 +779,10 @@ static inline bool bpf_jit_kallsyms_enabled(void) @@ -28,5 +28,5 @@ index 9f8aa2fe..de43bcf9 100644 __bpf_address_lookup(unsigned long addr, unsigned long *size, unsigned long *off, char *sym) -- -2.27.0 +2.28.0 diff --git a/patches/0023-events-remove-copy-and-paste-error.patch b/patches/0023-events-remove-copy-and-paste-error.patch index e299070..09ec23a 100644 --- a/patches/0023-events-remove-copy-and-paste-error.patch +++ b/patches/0023-events-remove-copy-and-paste-error.patch @@ -1,7 +1,7 @@ -From 1982bf7f19b02ea488ec5af79e2160487b9f7930 Mon Sep 17 00:00:00 2001 +From 27ac4bfc76bf3c6efda7aa3315bd37cb41818546 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 19:32:25 -0600 -Subject: [PATCH 23/32] events: remove copy and paste error +Subject: [PATCH 23/33] events: remove copy and paste error A stray 'static void' with nothing else anywhere is bound to cause some problems. @@ -12,7 +12,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 1 deletion(-) diff --git a/kernel/events/core.c b/kernel/events/core.c -index 2fdc8959..a9a65c1b 100644 +index 2fdc89591c39..a9a65c1b0974 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -991,7 +991,6 @@ static inline u64 perf_cgroup_event_time(struct perf_event *event) @@ -24,5 +24,5 @@ index 2fdc8959..a9a65c1b 100644 /* -- -2.27.0 +2.28.0 diff --git a/patches/0024-sched-fair-averaging-depends-on-CONFIG_FAIR_GROUP_SC.patch b/patches/0024-sched-fair-averaging-depends-on-CONFIG_FAIR_GROUP_SC.patch index 16cce5a..a8222db 100644 --- a/patches/0024-sched-fair-averaging-depends-on-CONFIG_FAIR_GROUP_SC.patch +++ b/patches/0024-sched-fair-averaging-depends-on-CONFIG_FAIR_GROUP_SC.patch @@ -1,7 +1,7 @@ -From df94bfdfb61c13fde1b294537d740d61bf3b0900 Mon Sep 17 00:00:00 2001 +From d9756dac97ee0d1d56141f54dc14bba644db6634 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 19:34:38 -0600 -Subject: [PATCH 24/32] sched: fair: averaging depends on +Subject: [PATCH 24/33] sched: fair: averaging depends on CONFIG_FAIR_GROUP_SCHED The avg member isn't defined in that struct for !CONFIG_FAIR_GROUP_SCHED @@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 9f3c7941..435a5cb7 100644 +index 4a6639d0f72f..514d5426ea62 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -661,7 +661,7 @@ static u64 sched_vslice(struct cfs_rq *cfs_rq, struct sched_entity *se) @@ -26,5 +26,5 @@ index 9f3c7941..435a5cb7 100644 /* Give new task start runnable values to heavy its load in infant time */ -- -2.27.0 +2.28.0 diff --git a/patches/0025-net-fib-fib_encap_match-requires-CONFIG_IP_ROUTE_MUL.patch b/patches/0025-net-fib-fib_encap_match-requires-CONFIG_IP_ROUTE_MUL.patch index 83bb437..6f10090 100644 --- a/patches/0025-net-fib-fib_encap_match-requires-CONFIG_IP_ROUTE_MUL.patch +++ b/patches/0025-net-fib-fib_encap_match-requires-CONFIG_IP_ROUTE_MUL.patch @@ -1,7 +1,7 @@ -From bf0d4f021b2a11ce6859f9297ed74adb287d56a6 Mon Sep 17 00:00:00 2001 +From f8a0a8ebcc87434d29753b914794cabe4c4e1367 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 19:37:11 -0600 -Subject: [PATCH 25/32] net: fib: fib_encap_match requires +Subject: [PATCH 25/33] net: fib: fib_encap_match requires CONFIG_IP_ROUTE_MULTIPATH Don't call into fib_encap_match when it's not defined on @@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 2 insertions(+) diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c -index e483e2e9..b3cdea36 100644 +index e483e2e916ca..b3cdea362f46 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c @@ -615,10 +615,12 @@ int fib_nh_match(struct fib_config *cfg, struct fib_info *fi) @@ -30,5 +30,5 @@ index e483e2e9..b3cdea36 100644 #ifdef CONFIG_IP_ROUTE_CLASSID if (cfg->fc_flow && -- -2.27.0 +2.28.0 diff --git a/patches/0026-sched-fair-idle_balance-is-always-defined.patch b/patches/0026-sched-fair-idle_balance-is-always-defined.patch index 26a50b8..3b2b467 100644 --- a/patches/0026-sched-fair-idle_balance-is-always-defined.patch +++ b/patches/0026-sched-fair-idle_balance-is-always-defined.patch @@ -1,7 +1,7 @@ -From 8e504c9ec7d17c6f75721372a369333d63fc26fb Mon Sep 17 00:00:00 2001 +From 3a0f6c2515290dd99f1a8135035d8cd57b03d421 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 19:39:21 -0600 -Subject: [PATCH 26/32] sched: fair: idle_balance is always defined +Subject: [PATCH 26/33] sched: fair: idle_balance is always defined So remove the stub function. @@ -11,7 +11,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 435a5cb7..f6307446 100644 +index 514d5426ea62..306bc7cbd2d8 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -2655,8 +2655,6 @@ void idle_exit_fair(struct rq *this_rq) @@ -35,7 +35,7 @@ index 435a5cb7..f6307446 100644 #endif /* CONFIG_SMP */ static void enqueue_sleeper(struct cfs_rq *cfs_rq, struct sched_entity *se) -@@ -4763,6 +4756,8 @@ static void set_skip_buddy(struct sched_entity *se) +@@ -4771,6 +4764,8 @@ static void set_skip_buddy(struct sched_entity *se) cfs_rq_of(se)->skip = se; } @@ -45,5 +45,5 @@ index 435a5cb7..f6307446 100644 * Preempt the current task with a newly woken task if needed: */ -- -2.27.0 +2.28.0 diff --git a/patches/0027-x86-mark-irq_set_vcpu_affinity-stub-as-static.patch b/patches/0027-x86-mark-irq_set_vcpu_affinity-stub-as-static.patch index f49bb3f..4de2271 100644 --- a/patches/0027-x86-mark-irq_set_vcpu_affinity-stub-as-static.patch +++ b/patches/0027-x86-mark-irq_set_vcpu_affinity-stub-as-static.patch @@ -1,7 +1,7 @@ -From 8ffbc478582020f616dbd7b0af56ff7e5c0464b7 Mon Sep 17 00:00:00 2001 +From 757886521c963e997f3f60aa6e88ea74f8a3916f Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 19:43:29 -0600 -Subject: [PATCH 27/32] x86: mark irq_set_vcpu_affinity stub as static +Subject: [PATCH 27/33] x86: mark irq_set_vcpu_affinity stub as static Without marking this as static, the linker complaints about conflicts. @@ -11,7 +11,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/irq_remapping.h b/arch/x86/include/asm/irq_remapping.h -index 8e346091..af7e774e 100644 +index 8e346091bb0f..af7e774ea346 100644 --- a/arch/x86/include/asm/irq_remapping.h +++ b/arch/x86/include/asm/irq_remapping.h @@ -117,7 +117,7 @@ static inline bool setup_remapped_irq(int irq, @@ -24,5 +24,5 @@ index 8e346091..af7e774e 100644 return -ENOSYS; } -- -2.27.0 +2.28.0 diff --git a/patches/0028-spec_ctrl-don-t-dereference-struct-module-without-CO.patch b/patches/0028-spec_ctrl-don-t-dereference-struct-module-without-CO.patch index e58e28c..1560a67 100644 --- a/patches/0028-spec_ctrl-don-t-dereference-struct-module-without-CO.patch +++ b/patches/0028-spec_ctrl-don-t-dereference-struct-module-without-CO.patch @@ -1,7 +1,7 @@ -From e1facb105d21b58caa435cb2bdcef7f7f562eb7c Mon Sep 17 00:00:00 2001 +From 61e6dbd92fc94f67e7e24ce0bf5bf9d55d1bbdd9 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 19:44:27 -0600 -Subject: [PATCH 28/32] spec_ctrl: don't dereference struct module without +Subject: [PATCH 28/33] spec_ctrl: don't dereference struct module without CONFIG_MODULE This structure isn't defined for !CONFIG_MODULE, so don't try to use it. @@ -12,10 +12,10 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 2 insertions(+) diff --git a/arch/x86/kernel/spec_ctrl.c b/arch/x86/kernel/spec_ctrl.c -index 9b09efcb..6b302522 100644 +index 7601d0b59dc7..d39c9a3b8a59 100644 --- a/arch/x86/kernel/spec_ctrl.c +++ b/arch/x86/kernel/spec_ctrl.c -@@ -482,9 +482,11 @@ bool spec_ctrl_enable_retpoline_ibrs_user(void) +@@ -504,9 +504,11 @@ bool spec_ctrl_enable_retpoline_ibrs_user(void) void spec_ctrl_report_unsafe_module(struct module *mod) { @@ -28,5 +28,5 @@ index 9b09efcb..6b302522 100644 unsafe_module = true; } -- -2.27.0 +2.28.0 diff --git a/patches/0029-cpuidle-define-cpuidle_poll_time-fallback-as-static.patch b/patches/0029-cpuidle-define-cpuidle_poll_time-fallback-as-static.patch index b94bbc4..8561509 100644 --- a/patches/0029-cpuidle-define-cpuidle_poll_time-fallback-as-static.patch +++ b/patches/0029-cpuidle-define-cpuidle_poll_time-fallback-as-static.patch @@ -1,7 +1,7 @@ -From 70260a2fc7d12fc63475bc7c938b689290ade7e1 Mon Sep 17 00:00:00 2001 +From e8bc78d49622ff4efe2e2edb5566d070157c9fa1 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 19:55:03 -0600 -Subject: [PATCH 29/32] cpuidle: define cpuidle_poll_time fallback as static +Subject: [PATCH 29/33] cpuidle: define cpuidle_poll_time fallback as static Otherwise the linker complains of multiple definitions. @@ -11,7 +11,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h -index bcfb33cb..bcfe3054 100644 +index bcfb33cb70c7..bcfe3054ef76 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -149,7 +149,7 @@ static inline void disable_cpuidle(void) { } @@ -24,5 +24,5 @@ index bcfb33cb..bcfe3054 100644 {return 0; } static inline struct cpuidle_driver *cpuidle_get_driver(void) {return NULL; } -- -2.27.0 +2.28.0 diff --git a/patches/0030-x86-remove-errant-CFI-usage-from-rwlock.patch b/patches/0030-x86-remove-errant-CFI-usage-from-rwlock.patch index 7b0c95c..ffbec4d 100644 --- a/patches/0030-x86-remove-errant-CFI-usage-from-rwlock.patch +++ b/patches/0030-x86-remove-errant-CFI-usage-from-rwlock.patch @@ -1,7 +1,7 @@ -From 28e48d6a4d6fb8319b609af0a6f1b063d3d8fc1b Mon Sep 17 00:00:00 2001 +From 1013aca961d8dd47191b4371da95a26ccfb60689 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Sun, 24 May 2020 21:25:28 -0600 -Subject: [PATCH 30/32] x86: remove errant CFI usage from rwlock +Subject: [PATCH 30/33] x86: remove errant CFI usage from rwlock These don't assemble with newer binutils due to the use of the cfi directives, so simply remove them, since they're anyway just for @@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 4 deletions(-) diff --git a/arch/x86/lib/rwlock.S b/arch/x86/lib/rwlock.S -index cc4a8c2f..34d5184a 100644 +index cc4a8c2f9b8d..34d5184ada35 100644 --- a/arch/x86/lib/rwlock.S +++ b/arch/x86/lib/rwlock.S @@ -12,7 +12,6 @@ @@ -43,5 +43,5 @@ index cc4a8c2f..34d5184a 100644 - CFI_ENDPROC END(__read_lock_failed) -- -2.27.0 +2.28.0 diff --git a/patches/0031-mm-guard-pudp_clear_flush_notify-with-mm-notifier-co.patch b/patches/0031-mm-guard-pudp_clear_flush_notify-with-mm-notifier-co.patch index 62dad52..ed99d2f 100644 --- a/patches/0031-mm-guard-pudp_clear_flush_notify-with-mm-notifier-co.patch +++ b/patches/0031-mm-guard-pudp_clear_flush_notify-with-mm-notifier-co.patch @@ -1,7 +1,7 @@ -From 8825de18ac72f761f5163121e42919bfd9e92d4b Mon Sep 17 00:00:00 2001 +From b5065fe42bae3379cc169a7ebab48805d4dd8eb2 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Fri, 19 Jun 2020 17:52:18 -0600 -Subject: [PATCH 31/32] mm: guard pudp_clear_flush_notify with mm notifier +Subject: [PATCH 31/33] mm: guard pudp_clear_flush_notify with mm notifier config Without CONFIG_MMU_NOTIFIER, pudp_clear_flush_notify isn't defined and @@ -13,7 +13,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 1 file changed, 2 insertions(+) diff --git a/mm/huge_memory.c b/mm/huge_memory.c -index 4c049978..b8171d1c 100644 +index 4d7993ce39ba..a709ea6eb322 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2035,7 +2035,9 @@ void __split_huge_page_pud(struct vm_area_struct *vma, unsigned long address, @@ -27,5 +27,5 @@ index 4c049978..b8171d1c 100644 out: spin_unlock(ptl); -- -2.27.0 +2.28.0 diff --git a/patches/0032-x86-clear-smap-in-cr4-when-not-used.patch b/patches/0032-x86-clear-smap-in-cr4-when-not-used.patch index aea0a77..de67e2f 100644 --- a/patches/0032-x86-clear-smap-in-cr4-when-not-used.patch +++ b/patches/0032-x86-clear-smap-in-cr4-when-not-used.patch @@ -1,7 +1,7 @@ -From 2d2e258b1411152658ff43b864ccc44b437f27dd Mon Sep 17 00:00:00 2001 +From f33db22cf6467e06805aec240ced40916c550492 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Fri, 19 Jun 2020 18:07:53 -0600 -Subject: [PATCH 32/32] x86: clear smap in cr4 when not used +Subject: [PATCH 32/33] x86: clear smap in cr4 when not used If the CPU supports SMAP, but it isn't specified in the config, then we need to explicitly clear it from cr4. Otherwise the processor will trap @@ -17,7 +17,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/disabled-features.h b/arch/x86/include/asm/disabled-features.h -index 476b053e..990bc623 100644 +index 476b053ef1c1..990bc6232376 100644 --- a/arch/x86/include/asm/disabled-features.h +++ b/arch/x86/include/asm/disabled-features.h @@ -16,6 +16,12 @@ @@ -43,10 +43,10 @@ index 476b053e..990bc623 100644 #define DISABLED_MASK11 0 #define DISABLED_MASK12 0 diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c -index c85d0534..3f32cb25 100644 +index c33396b4a3e0..e03b532d96ee 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c -@@ -355,7 +355,7 @@ static const char * const spectre_v1_strings[] = { +@@ -449,7 +449,7 @@ static const char * const spectre_v1_strings[] = { */ static bool smap_works_speculatively(void) { @@ -56,10 +56,10 @@ index c85d0534..3f32cb25 100644 /* diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c -index 3bfd4eda..62df3963 100644 +index 1970e49705e0..67d6f0c692cf 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c -@@ -349,7 +349,11 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c) +@@ -355,7 +355,11 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c) BUG_ON(eflags & X86_EFLAGS_AC); if (cpu_has(c, X86_FEATURE_SMAP)) @@ -72,7 +72,7 @@ index 3bfd4eda..62df3963 100644 static __always_inline void setup_umip(struct cpuinfo_x86 *c) diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c -index 4698dedc..50c04da8 100644 +index 4698dedc7071..50c04da82508 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -1207,7 +1207,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code, @@ -85,5 +85,5 @@ index 4698dedc..50c04da8 100644 bad_area_nosemaphore(regs, error_code, address, NULL); -- -2.27.0 +2.28.0 diff --git a/patches/0033-mm-only-use-bdev-functions-for-CONFIG_BLOCK.patch b/patches/0033-mm-only-use-bdev-functions-for-CONFIG_BLOCK.patch new file mode 100644 index 0000000..5908bff --- /dev/null +++ b/patches/0033-mm-only-use-bdev-functions-for-CONFIG_BLOCK.patch @@ -0,0 +1,31 @@ +From 949366463796471c62032e2b57ef5e501efb0c4d Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" <Jason@zx2c4.com> +Date: Wed, 30 Sep 2020 16:58:15 +0200 +Subject: [PATCH 33/33] mm: only use bdev functions for CONFIG_BLOCK + +Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> +--- + mm/filemap.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/mm/filemap.c b/mm/filemap.c +index 89a4851ac925..1c826057289b 100644 +--- a/mm/filemap.c ++++ b/mm/filemap.c +@@ -2186,9 +2186,13 @@ generic_file_aio_read2(struct kiocb *iocb, const struct iovec *iov, + goto out; /* skip atime */ + size = i_size_read(inode); + ++#ifdef CONFIG_BLOCK + bs_mask = (1 << blksize_bits( + bdev_logical_block_size(inode->i_sb->s_bdev))) + - 1; ++#else ++ bs_mask = 0; ++#endif + + if ((pos | count) & bs_mask) { + if (pos == size) +-- +2.28.0 + |