aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-5.4/902-debloat_proc.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2022-04-06 00:46:27 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2022-04-07 20:42:34 +0200
commit39bf2aee0ed840ff6bb4838bc0a42aaddc36a4d3 (patch)
tree1af94a9d02252f72613b12dcbdeebd6cb6ffc04d /target/linux/generic/hack-5.4/902-debloat_proc.patch
parent3008f1f441a41e162311cee1ccadfdaaec1581c1 (diff)
downloadupstream-39bf2aee0ed840ff6bb4838bc0a42aaddc36a4d3.tar.gz
upstream-39bf2aee0ed840ff6bb4838bc0a42aaddc36a4d3.tar.bz2
upstream-39bf2aee0ed840ff6bb4838bc0a42aaddc36a4d3.zip
kernel: bump 5.4 to 5.4.188
Added the new configuration options: CONFIG_HARDEN_BRANCH_HISTORY=y CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y Manually adapted: target/linux/generic/hack-5.4/220-gc_sections.patch Compile-tested: lantiq/xrx200, armvirt/64 Run-tested: lantiq/xrx200, armvirt/64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/hack-5.4/902-debloat_proc.patch')
-rw-r--r--target/linux/generic/hack-5.4/902-debloat_proc.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/hack-5.4/902-debloat_proc.patch b/target/linux/generic/hack-5.4/902-debloat_proc.patch
index c680e7bc40..0309b3c3ca 100644
--- a/target/linux/generic/hack-5.4/902-debloat_proc.patch
+++ b/target/linux/generic/hack-5.4/902-debloat_proc.patch
@@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/core/sock.c
+++ b/net/core/sock.c
-@@ -3643,6 +3643,8 @@ static __net_initdata struct pernet_oper
+@@ -3641,6 +3641,8 @@ static __net_initdata struct pernet_oper
static int __init proto_init(void)
{