6.10: Sync, update amd-pstate-cpb to v15

Signed-off-by: Peter Jung <[email protected]>

6.10/0002-bbr3.patch

@@ -1,7 +1,7 @@
-From ac8ed29945a1560ef828e024c6c85810b8543e43 Mon Sep 17 00:00:00 2001
+From c6ed2142b0ee1a2d0e70ebd1f9d279a6d1db08a1 Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
 Date: Mon, 24 Jun 2024 15:46:30 +0200
-Subject: [PATCH 02/10] bbr3
+Subject: [PATCH 02/11] bbr3
 
 Signed-off-by: Peter Jung <[email protected]>
 ---
@@ -39,7 +39,7 @@ index 6a5e08b937b31..27aab715490ea 100644
  fastopen_connect:1, /* FASTOPEN_CONNECT sockopt */
  fastopen_no_cookie:1, /* Allow send/recv SYN+data without a cookie */
 diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
-index 7d6b1254c92d5..2ce55f4444342 100644
+index c0deaafebfdc0..d53f042d936e8 100644
 --- a/include/net/inet_connection_sock.h
 +++ b/include/net/inet_connection_sock.h
 @@ -137,8 +137,8 @@ struct inet_connection_sock {
@@ -3032,7 +3032,7 @@ index 28ffcfbeef14e..7b13915ba2884 100644
  icsk->icsk_ca_ops->init(sk);
  if (tcp_ca_needs_ecn(sk))
 diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
-index 01d208e0eef31..a54951d6871d1 100644
+index 2e39cb881e209..7d471e04ad78e 100644
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
 @@ -365,7 +365,7 @@ static void __tcp_ecn_check_ce(struct sock *sk, const struct sk_buff *skb)
@@ -3084,7 +3084,7 @@ index 01d208e0eef31..a54951d6871d1 100644
  /* When we're adding to gso_segs == 1, gso_size will be zero,
  * in theory this shouldn't be necessary but as long as DSACK
  * code can come after this skb later on it's better to keep
-@@ -3764,7 +3780,8 @@ static void tcp_replace_ts_recent(struct tcp_sock *tp, u32 seq)
+@@ -3781,7 +3797,8 @@ static void tcp_replace_ts_recent(struct tcp_sock *tp, u32 seq)
  /* This routine deals with acks during a TLP episode and ends an episode by
  * resetting tlp_high_seq. Ref: TLP algorithm in draft-ietf-tcpm-rack
  */
@@ -3094,15 +3094,15 @@ index 01d208e0eef31..a54951d6871d1 100644
  {
  struct tcp_sock *tp = tcp_sk(sk);
 
-@@ -3781,6 +3798,7 @@ static void tcp_process_tlp_ack(struct sock *sk, u32 ack, int flag)
+@@ -3798,6 +3815,7 @@ static void tcp_process_tlp_ack(struct sock *sk, u32 ack, int flag)
  /* ACK advances: there was a loss, so reduce cwnd. Reset
  * tlp_high_seq in tcp_init_cwnd_reduction()
  */
 + tcp_ca_event(sk, CA_EVENT_TLP_RECOVERY);
  tcp_init_cwnd_reduction(sk);
  tcp_set_ca_state(sk, TCP_CA_CWR);
  tcp_end_cwnd_reduction(sk);
-@@ -3791,6 +3809,11 @@ static void tcp_process_tlp_ack(struct sock *sk, u32 ack, int flag)
+@@ -3808,6 +3826,11 @@ static void tcp_process_tlp_ack(struct sock *sk, u32 ack, int flag)
  FLAG_NOT_DUP | FLAG_DATA_SACKED))) {
  /* Pure dupack: original and TLP probe arrived; no loss */
  tp->tlp_high_seq = 0;
@@ -3114,15 +3114,15 @@ index 01d208e0eef31..a54951d6871d1 100644
  }
  }
 
-@@ -3899,6 +3922,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
+@@ -3916,6 +3939,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
 
  prior_fack = tcp_is_sack(tp) ? tcp_highest_sack_seq(tp) : tp->snd_una;
  rs.prior_in_flight = tcp_packets_in_flight(tp);
 + tcp_rate_check_app_limited(sk);
 
  /* ts_recent update must be made after we are sure that the packet
  * is in window.
-@@ -3973,7 +3997,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
+@@ -3990,7 +4014,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
  tcp_rack_update_reo_wnd(sk, &rs);
 
  if (tp->tlp_high_seq)
@@ -3131,15 +3131,15 @@ index 01d208e0eef31..a54951d6871d1 100644
 
  if (tcp_ack_is_dubious(sk, flag)) {
  if (!(flag & (FLAG_SND_UNA_ADVANCED |
-@@ -3997,6 +4021,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
+@@ -4014,6 +4038,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
  delivered = tcp_newly_delivered(sk, delivered, flag);
  lost = tp->lost - lost; /* freshly marked lost */
  rs.is_ack_delayed = !!(flag & FLAG_ACK_MAYBE_DELAYED);
 + rs.is_ece = !!(flag & FLAG_ECE);
  tcp_rate_gen(sk, delivered, lost, is_sack_reneg, sack_state.rate);
  tcp_cong_control(sk, ack, delivered, flag, sack_state.rate);
  tcp_xmit_recovery(sk, rexmit);
-@@ -4016,7 +4041,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
+@@ -4033,7 +4058,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
  tcp_ack_probe(sk);
 
  if (tp->tlp_high_seq)
@@ -3148,7 +3148,7 @@ index 01d208e0eef31..a54951d6871d1 100644
  return 1;
 
  old_ack:
-@@ -5671,13 +5696,14 @@ static void __tcp_ack_snd_check(struct sock *sk, int ofo_possible)
+@@ -5688,13 +5713,14 @@ static void __tcp_ack_snd_check(struct sock *sk, int ofo_possible)
 
  /* More than one full frame received... */
  if (((tp->rcv_nxt - tp->rcv_wup) > inet_csk(sk)->icsk_ack.rcv_mss &&

6.10/0003-block.patch

@@ -1,7 +1,7 @@
-From e78fdad9afb17a3a037bd980598169b903f93176 Mon Sep 17 00:00:00 2001
+From de9b4b869ed17ee24e9d4fe2c88e9ad2ff54c1d3 Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
 Date: Mon, 24 Jun 2024 15:47:07 +0200
-Subject: [PATCH 03/10] block
+Subject: [PATCH 03/11] block
 
 Signed-off-by: Peter Jung <[email protected]>
 ---

6.10/0004-cachy.patch

@@ -1,7 +1,7 @@
-From 98f33b3553da535d313b27df9bedbd8075d3c9e4 Mon Sep 17 00:00:00 2001
+From 035b0483e86bb78ac464c953767cfb0007aa2c95 Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
 Date: Mon, 24 Jun 2024 15:47:17 +0200
-Subject: [PATCH 04/10] cachy
+Subject: [PATCH 04/11] cachy
 
 Signed-off-by: Peter Jung <[email protected]>
 ---
@@ -66,10 +66,10 @@ Signed-off-by: Peter Jung <[email protected]>
  create mode 100644 drivers/pci/controller/intel-nvme-remap.c
 
 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 11e57ba2985cc..ce1557c65764b 100644
+index 27ec49af1bf27..07ac4c81a7ddd 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -2248,6 +2248,9 @@
+@@ -2229,6 +2229,9 @@
  disable
  Do not enable intel_pstate as the default
  scaling driver for the supported processors
@@ -79,7 +79,7 @@ index 11e57ba2985cc..ce1557c65764b 100644
  active
  Use intel_pstate driver to bypass the scaling
  governors layer of cpufreq and provides it own
-@@ -4466,6 +4469,15 @@
+@@ -4447,6 +4450,15 @@
  nomsi [MSI] If the PCI_MSI kernel config parameter is
  enabled, this kernel boot option can be used to
  disable the use of MSI interrupts system-wide.
@@ -96,7 +96,7 @@ index 11e57ba2985cc..ce1557c65764b 100644
  Safety option to keep boot IRQs enabled. This
  should never be necessary.
 diff --git a/Makefile b/Makefile
-index 4d36f943b3b1f..d82fe7100ac22 100644
+index 06aa6402b3850..99ce325af904d 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -817,6 +817,9 @@ KBUILD_CFLAGS += -fno-delete-null-pointer-checks
@@ -936,7 +936,7 @@ index fe9ceb0d2288a..b58955caf19bf 100644
  obj-$(CONFIG_MTD) += mtd/
  obj-$(CONFIG_SPI) += spi/
 diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
-index 5eb38fbbbecdb..bd9a7cd465aae 100644
+index fc6fd583faf8a..f79e205a51dd1 100644
 --- a/drivers/ata/ahci.c
 +++ b/drivers/ata/ahci.c
 @@ -1618,7 +1618,7 @@ static irqreturn_t ahci_thunderx_irq_handler(int irq, void *dev_instance)
@@ -992,7 +992,7 @@ index 5eb38fbbbecdb..bd9a7cd465aae 100644
  sysfs_add_file_to_group(&pdev->dev.kobj,
  &dev_attr_remapped_nvme.attr,
 diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86
-index 438c9e75a04dc..1bbfeca5f01ec 100644
+index 97c2d4f15d76e..5a3af44d785a1 100644
 --- a/drivers/cpufreq/Kconfig.x86
 +++ b/drivers/cpufreq/Kconfig.x86
 @@ -9,7 +9,6 @@ config X86_INTEL_PSTATE
@@ -1012,10 +1012,10 @@ index 438c9e75a04dc..1bbfeca5f01ec 100644
  This driver adds a CPUFreq driver which utilizes a fine grain
  processor performance frequency control range instead of legacy
 diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
-index 15de5e3d96fd4..2c9ddb4d71766 100644
+index c31914a9876fa..1035c074f36a4 100644
 --- a/drivers/cpufreq/intel_pstate.c
 +++ b/drivers/cpufreq/intel_pstate.c
-@@ -3551,6 +3551,8 @@ static int __init intel_pstate_setup(char *str)
+@@ -3550,6 +3550,8 @@ static int __init intel_pstate_setup(char *str)
 
  if (!strcmp(str, "disable"))
  no_load = 1;
@@ -1182,10 +1182,10 @@ index c11952a4389bc..52f54a228b39c 100644
  }
 
 diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
-index 7789b313285c4..c1c6330e287df 100644
+index e1796ecf9c05c..5e46bd2932059 100644
 --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
 +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
-@@ -2736,7 +2736,10 @@ int smu_get_power_limit(void *handle,
+@@ -2749,7 +2749,10 @@ int smu_get_power_limit(void *handle,
  *limit = smu->max_power_limit;
  break;
  case SMU_PPT_LIMIT_MIN:
@@ -1197,7 +1197,7 @@ index 7789b313285c4..c1c6330e287df 100644
  break;
  default:
  return -EINVAL;
-@@ -2760,7 +2763,14 @@ static int smu_set_power_limit(void *handle, uint32_t limit)
+@@ -2773,7 +2776,14 @@ static int smu_set_power_limit(void *handle, uint32_t limit)
  if (smu->ppt_funcs->set_power_limit)
  return smu->ppt_funcs->set_power_limit(smu, limit_type, limit);
 
@@ -1234,7 +1234,7 @@ index fe6e8a1bb6072..1488a904e3bf6 100644
  tristate "Nvidia nForce2, nForce3 and nForce4"
  depends on PCI && HAS_IOPORT
 diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
-index 3d65934f5eb48..cf3b9ca328ad4 100644
+index 78d0561339e5b..9ea3a294f9f02 100644
 --- a/drivers/i2c/busses/Makefile
 +++ b/drivers/i2c/busses/Makefile
 @@ -20,6 +20,7 @@ obj-$(CONFIG_I2C_CHT_WC) += i2c-cht-wc.o
@@ -6651,10 +6651,10 @@ index b4cb45255a541..8635b3b247397 100644
 
  #
 diff --git a/mm/compaction.c b/mm/compaction.c
-index e731d45befc78..78653db1ddd8b 100644
+index 739b1bf3d6377..3a4269c02fb20 100644
 --- a/mm/compaction.c
 +++ b/mm/compaction.c
-@@ -1943,7 +1943,11 @@ static int sysctl_compact_unevictable_allowed __read_mostly = CONFIG_COMPACT_UNE
+@@ -1950,7 +1950,11 @@ static int sysctl_compact_unevictable_allowed __read_mostly = CONFIG_COMPACT_UNE
  * aggressively the kernel should compact memory in the
  * background. It takes values in the range [0, 100].
  */
@@ -6711,7 +6711,7 @@ index 12c9297ed4a7f..761f481423251 100644
  EXPORT_SYMBOL_GPL(dirty_writeback_interval);
 
 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index 7300aa9f14b0b..fde2a84d858b3 100644
+index 9ecf99190ea20..6191be6c5de9c 100644
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
 @@ -271,7 +271,11 @@ const char * const migratetype_names[MIGRATE_TYPES] = {

6.10/0005-crypto.patch

@@ -1,7 +1,7 @@
-From 24d1837875e21c2c5551676ec2587f5d05b42d98 Mon Sep 17 00:00:00 2001
+From 87dd145ede1cd0c56dcc794d21ccdda057350c98 Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
 Date: Mon, 24 Jun 2024 15:47:28 +0200
-Subject: [PATCH 05/10] crypto
+Subject: [PATCH 05/11] crypto
 
 Signed-off-by: Peter Jung <[email protected]>
 ---

6.10/0006-fixes.patch

@@ -1,7 +1,7 @@
-From 18c09a6ec663a990912840766b1c4f09753f7857 Mon Sep 17 00:00:00 2001
+From f4e2d524a239e855973275623e21ae1b6c090fc8 Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
 Date: Mon, 24 Jun 2024 15:47:38 +0200
-Subject: [PATCH 06/10] fixes
+Subject: [PATCH 06/11] fixes
 
 Signed-off-by: Peter Jung <[email protected]>
 ---

6.10/0007-handheld.patch

@@ -1,7 +1,7 @@
-From 66e0468e019161a4a12d23a84610036856fb83f2 Mon Sep 17 00:00:00 2001
+From 9774202dd0606badb5f46d57e3b6757e356da809 Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
 Date: Mon, 24 Jun 2024 15:48:01 +0200
-Subject: [PATCH 07/10] handheld
+Subject: [PATCH 07/11] handheld
 
 Signed-off-by: Peter Jung <[email protected]>
 ---

6.10/0008-ksm.patch

@@ -1,7 +1,7 @@
-From 8193d89f8884da591dec66fe1e60451fa18274f3 Mon Sep 17 00:00:00 2001
+From 51cdd28c2127d403caf64d30e7960ca4387aa748 Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
 Date: Mon, 24 Jun 2024 15:48:14 +0200
-Subject: [PATCH 08/10] ksm
+Subject: [PATCH 08/11] ksm
 
 Signed-off-by: Peter Jung <[email protected]>
 ---
@@ -64,7 +64,7 @@ index 1346579f802f7..f3a77719eb057 100644
 
  #define __ARCH_WANT_SYS_CLONE
 diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h
-index 266b96acc0143..56c1a1d1f94b2 100644
+index 1386e8e751f24..ccdc523fa4bdc 100644
 --- a/arch/arm64/include/asm/unistd32.h
 +++ b/arch/arm64/include/asm/unistd32.h
 @@ -931,6 +931,12 @@ __SYSCALL(__NR_lsm_set_self_attr, sys_lsm_set_self_attr)
@@ -103,7 +103,7 @@ index 2b81a6bd78b29..e2a93c856eede 100644
 +464 common process_ksm_disable sys_process_ksm_disable
 +465 common process_ksm_status sys_process_ksm_status
 diff --git a/arch/mips/kernel/syscalls/syscall_n32.tbl b/arch/mips/kernel/syscalls/syscall_n32.tbl
-index cc869f5d56931..9168b5c2065a3 100644
+index 953f5b7dc723f..b921fbf56fa6d 100644
 --- a/arch/mips/kernel/syscalls/syscall_n32.tbl
 +++ b/arch/mips/kernel/syscalls/syscall_n32.tbl
 @@ -401,3 +401,6 @@
@@ -125,7 +125,7 @@ index 1464c6be6eb3c..8d7f9ddd66f4b 100644
 +464 n64 process_ksm_disable sys_process_ksm_disable
 +465 n64 process_ksm_status sys_process_ksm_status
 diff --git a/arch/mips/kernel/syscalls/syscall_o32.tbl b/arch/mips/kernel/syscalls/syscall_o32.tbl
-index 81428a2eb6604..fc8644e583198 100644
+index 2439a2491cffe..9d6142739954d 100644
 --- a/arch/mips/kernel/syscalls/syscall_o32.tbl
 +++ b/arch/mips/kernel/syscalls/syscall_o32.tbl
 @@ -450,3 +450,6 @@
@@ -136,7 +136,7 @@ index 81428a2eb6604..fc8644e583198 100644
 +464 o32 process_ksm_disable sys_process_ksm_disable
 +465 o32 process_ksm_status sys_process_ksm_status
 diff --git a/arch/parisc/kernel/syscalls/syscall.tbl b/arch/parisc/kernel/syscalls/syscall.tbl
-index b13c21373974c..a051960a87d32 100644
+index 66dc406b12e44..9d46476fd9083 100644
 --- a/arch/parisc/kernel/syscalls/syscall.tbl
 +++ b/arch/parisc/kernel/syscalls/syscall.tbl
 @@ -461,3 +461,6 @@
@@ -147,18 +147,18 @@ index b13c21373974c..a051960a87d32 100644
 +464 common process_ksm_disable sys_process_ksm_disable
 +465 common process_ksm_status sys_process_ksm_status
 diff --git a/arch/powerpc/kernel/syscalls/syscall.tbl b/arch/powerpc/kernel/syscalls/syscall.tbl
-index 3656f1ca7a21c..1183dae34eb3d 100644
+index ebae8415dfbba..16f71bc2f6f01 100644
 --- a/arch/powerpc/kernel/syscalls/syscall.tbl
 +++ b/arch/powerpc/kernel/syscalls/syscall.tbl
-@@ -549,3 +549,6 @@
+@@ -553,3 +553,6 @@
  460 common lsm_set_self_attr sys_lsm_set_self_attr
  461 common lsm_list_modules sys_lsm_list_modules
  462 common mseal sys_mseal
 +463 common process_ksm_enable sys_process_ksm_enable
 +464 common process_ksm_disable sys_process_ksm_disable
 +465 common process_ksm_status sys_process_ksm_status
 diff --git a/arch/s390/kernel/syscalls/syscall.tbl b/arch/s390/kernel/syscalls/syscall.tbl
-index bd0fee24ad10a..6905956796736 100644
+index 01071182763e9..7394bad8178e6 100644
 --- a/arch/s390/kernel/syscalls/syscall.tbl
 +++ b/arch/s390/kernel/syscalls/syscall.tbl
 @@ -465,3 +465,6 @@
@@ -169,18 +169,18 @@ index bd0fee24ad10a..6905956796736 100644
 +464 common process_ksm_disable sys_process_ksm_disable sys_process_ksm_disable
 +465 common process_ksm_status sys_process_ksm_status sys_process_ksm_status
 diff --git a/arch/sh/kernel/syscalls/syscall.tbl b/arch/sh/kernel/syscalls/syscall.tbl
-index bbf83a2db9868..191db240cde7a 100644
+index c55fd7696d40f..b9fc31221b874 100644
 --- a/arch/sh/kernel/syscalls/syscall.tbl
 +++ b/arch/sh/kernel/syscalls/syscall.tbl
-@@ -465,3 +465,6 @@
+@@ -466,3 +466,6 @@
  460 common lsm_set_self_attr sys_lsm_set_self_attr
  461 common lsm_list_modules sys_lsm_list_modules
  462 common mseal sys_mseal
 +463 common process_ksm_enable sys_process_ksm_enable
 +464 common process_ksm_disable sys_process_ksm_disable
 +465 common process_ksm_status sys_process_ksm_status
 diff --git a/arch/sparc/kernel/syscalls/syscall.tbl b/arch/sparc/kernel/syscalls/syscall.tbl
-index ac6c281ccfe02..8b1122584521c 100644
+index cfdfb3707c167..0d79fd7728540 100644
 --- a/arch/sparc/kernel/syscalls/syscall.tbl
 +++ b/arch/sparc/kernel/syscalls/syscall.tbl
 @@ -508,3 +508,6 @@
@@ -191,7 +191,7 @@ index ac6c281ccfe02..8b1122584521c 100644
 +464 common process_ksm_disable sys_process_ksm_disable
 +465 common process_ksm_status sys_process_ksm_status
 diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl
-index 7fd1f57ad3d30..d02c8caa83bf9 100644
+index d6ebcab1d8b28..ae5d147f05f2f 100644
 --- a/arch/x86/entry/syscalls/syscall_32.tbl
 +++ b/arch/x86/entry/syscalls/syscall_32.tbl
 @@ -467,3 +467,6 @@
@@ -227,7 +227,7 @@ index 67083fc1b2f56..c1aecee4ad9b6 100644
 +464 common process_ksm_disable sys_process_ksm_disable
 +465 common process_ksm_status sys_process_ksm_status
 diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
-index 9104952d323d1..25c204cd25799 100644
+index 63424af87bbab..5c7de798af90d 100644
 --- a/include/linux/syscalls.h
 +++ b/include/linux/syscalls.h
 @@ -818,6 +818,9 @@ asmlinkage long sys_madvise(unsigned long start, size_t len, int behavior);
@@ -241,7 +241,7 @@ index 9104952d323d1..25c204cd25799 100644
  unsigned long prot, unsigned long pgoff,
  unsigned long flags);
 diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h
-index d983c48a3b6af..2187351b4f4e3 100644
+index d4cc26932ff47..d191548f6326c 100644
 --- a/include/uapi/asm-generic/unistd.h
 +++ b/include/uapi/asm-generic/unistd.h
 @@ -845,8 +845,17 @@ __SYSCALL(__NR_lsm_list_modules, sys_lsm_list_modules)
@@ -422,7 +422,7 @@ index 3a2df1bd9f640..86c6dd9d8c847 100644
  struct getcpu_cache __user *, unused)
  {
 diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c
-index d7eee421d4bc3..d44a89dedb872 100644
+index b696b85ac63e0..cf7f3d841b1ec 100644
 --- a/kernel/sys_ni.c
 +++ b/kernel/sys_ni.c
 @@ -188,6 +188,9 @@ COND_SYSCALL(mincore);