rebase CLR patch set for 5.10.5

0102-increase-the-ext4-default-commit-age.patch

@@ -18,7 +18,7 @@ Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
-index 08f904943ab2..e1dbaf1b1e17 100644
+index 578ff196b3ce..e8db44307150 100644
 --- a/include/linux/jbd2.h
 +++ b/include/linux/jbd2.h
 @@ -45,7 +45,7 @@

0103-silence-rapl.patch

@@ -8,10 +8,10 @@ Subject: [PATCH] silence rapl
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
-index 983d75bd5bd1..0b3f50502332 100644
+index 70d6d52bc1e2..8f49575319b5 100644
 --- a/drivers/powercap/intel_rapl_common.c
 +++ b/drivers/powercap/intel_rapl_common.c
-@@ -1498,7 +1498,7 @@ static int __init rapl_init(void)
+@@ -1446,7 +1446,7 @@ static int __init rapl_init(void)
 
  	id = x86_match_cpu(rapl_ids);
  	if (!id) {

0104-pci-pme-wakeups.patch

@@ -10,10 +10,10 @@ boards (sadly, too many of them) in laptops.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
-index b2fed944903e..0596bef4213f 100644
+index 6427cbd0a5be..b70b330422cb 100644
 --- a/drivers/pci/pci.c
 +++ b/drivers/pci/pci.c
-@@ -62,7 +62,7 @@ struct pci_pme_device {
+@@ -59,7 +59,7 @@ struct pci_pme_device {
  	struct pci_dev *dev;
  };
 

0105-ksm-wakeups.patch

@@ -26,7 +26,7 @@ index 71109065bd8e..44ae1e267d48 100644
 
  struct cpumask watchdog_cpumask __read_mostly;
 diff --git a/mm/ksm.c b/mm/ksm.c
-index 9afccc36dbd2..42328775e989 100644
+index 0960750bb316..3c51c716b8c5 100644
 --- a/mm/ksm.c
 +++ b/mm/ksm.c
 @@ -2423,9 +2423,14 @@ static int ksm_scan_thread(void *nothing)

0106-intel_idle-tweak-cpuidle-cstates.patch

@@ -14,10 +14,10 @@ performance while keeping power efficiency
  1 file changed, 22 insertions(+), 22 deletions(-)
 
 diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
-index 3a1617a3e5bf..4f0ac8a9c6ab 100644
+index d79335506ecd..3154cebef986 100644
 --- a/drivers/idle/intel_idle.c
 +++ b/drivers/idle/intel_idle.c
-@@ -498,7 +498,7 @@ static struct cpuidle_state hsw_cstates[] __initdata = {
+@@ -502,7 +502,7 @@ static struct cpuidle_state hsw_cstates[] __initdata = {
  		.desc = "MWAIT 0x01",
  		.flags = MWAIT2flg(0x01) | CPUIDLE_FLAG_ALWAYS_ENABLE,
  		.exit_latency = 10,
@@ -26,7 +26,7 @@ index 3a1617a3e5bf..4f0ac8a9c6ab 100644
  		.enter = &intel_idle,
  		.enter_s2idle = intel_idle_s2idle, },
  	{
-@@ -506,7 +506,7 @@ static struct cpuidle_state hsw_cstates[] __initdata = {
+@@ -510,7 +510,7 @@ static struct cpuidle_state hsw_cstates[] __initdata = {
  		.desc = "MWAIT 0x10",
  		.flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED,
  		.exit_latency = 33,
@@ -35,7 +35,7 @@ index 3a1617a3e5bf..4f0ac8a9c6ab 100644
  		.enter = &intel_idle,
  		.enter_s2idle = intel_idle_s2idle, },
  	{
-@@ -514,7 +514,7 @@ static struct cpuidle_state hsw_cstates[] __initdata = {
+@@ -518,7 +518,7 @@ static struct cpuidle_state hsw_cstates[] __initdata = {
  		.desc = "MWAIT 0x20",
  		.flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED,
  		.exit_latency = 133,
@@ -44,7 +44,7 @@ index 3a1617a3e5bf..4f0ac8a9c6ab 100644
  		.enter = &intel_idle,
  		.enter_s2idle = intel_idle_s2idle, },
  	{
-@@ -522,7 +522,7 @@ static struct cpuidle_state hsw_cstates[] __initdata = {
+@@ -526,7 +526,7 @@ static struct cpuidle_state hsw_cstates[] __initdata = {
  		.desc = "MWAIT 0x32",
  		.flags = MWAIT2flg(0x32) | CPUIDLE_FLAG_TLB_FLUSHED,
  		.exit_latency = 166,
@@ -53,7 +53,7 @@ index 3a1617a3e5bf..4f0ac8a9c6ab 100644
  		.enter = &intel_idle,
  		.enter_s2idle = intel_idle_s2idle, },
  	{
-@@ -530,7 +530,7 @@ static struct cpuidle_state hsw_cstates[] __initdata = {
+@@ -534,7 +534,7 @@ static struct cpuidle_state hsw_cstates[] __initdata = {
  		.desc = "MWAIT 0x40",
  		.flags = MWAIT2flg(0x40) | CPUIDLE_FLAG_TLB_FLUSHED,
  		.exit_latency = 300,
@@ -62,7 +62,7 @@ index 3a1617a3e5bf..4f0ac8a9c6ab 100644
  		.enter = &intel_idle,
  		.enter_s2idle = intel_idle_s2idle, },
  	{
-@@ -538,7 +538,7 @@ static struct cpuidle_state hsw_cstates[] __initdata = {
+@@ -542,7 +542,7 @@ static struct cpuidle_state hsw_cstates[] __initdata = {
  		.desc = "MWAIT 0x50",
  		.flags = MWAIT2flg(0x50) | CPUIDLE_FLAG_TLB_FLUSHED,
  		.exit_latency = 600,
@@ -71,7 +71,7 @@ index 3a1617a3e5bf..4f0ac8a9c6ab 100644
  		.enter = &intel_idle,
  		.enter_s2idle = intel_idle_s2idle, },
  	{
-@@ -546,7 +546,7 @@ static struct cpuidle_state hsw_cstates[] __initdata = {
+@@ -550,7 +550,7 @@ static struct cpuidle_state hsw_cstates[] __initdata = {
  		.desc = "MWAIT 0x60",
  		.flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED,
  		.exit_latency = 2600,
@@ -80,7 +80,7 @@ index 3a1617a3e5bf..4f0ac8a9c6ab 100644
  		.enter = &intel_idle,
  		.enter_s2idle = intel_idle_s2idle, },
  	{
-@@ -566,7 +566,7 @@ static struct cpuidle_state bdw_cstates[] __initdata = {
+@@ -570,7 +570,7 @@ static struct cpuidle_state bdw_cstates[] __initdata = {
  		.desc = "MWAIT 0x01",
  		.flags = MWAIT2flg(0x01) | CPUIDLE_FLAG_ALWAYS_ENABLE,
  		.exit_latency = 10,
@@ -89,7 +89,7 @@ index 3a1617a3e5bf..4f0ac8a9c6ab 100644
  		.enter = &intel_idle,
  		.enter_s2idle = intel_idle_s2idle, },
  	{
-@@ -574,7 +574,7 @@ static struct cpuidle_state bdw_cstates[] __initdata = {
+@@ -578,7 +578,7 @@ static struct cpuidle_state bdw_cstates[] __initdata = {
  		.desc = "MWAIT 0x10",
  		.flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED,
  		.exit_latency = 40,
@@ -98,7 +98,7 @@ index 3a1617a3e5bf..4f0ac8a9c6ab 100644
  		.enter = &intel_idle,
  		.enter_s2idle = intel_idle_s2idle, },
  	{
-@@ -582,7 +582,7 @@ static struct cpuidle_state bdw_cstates[] __initdata = {
+@@ -586,7 +586,7 @@ static struct cpuidle_state bdw_cstates[] __initdata = {
  		.desc = "MWAIT 0x20",
  		.flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED,
  		.exit_latency = 133,
@@ -107,7 +107,7 @@ index 3a1617a3e5bf..4f0ac8a9c6ab 100644
  		.enter = &intel_idle,
  		.enter_s2idle = intel_idle_s2idle, },
  	{
-@@ -590,7 +590,7 @@ static struct cpuidle_state bdw_cstates[] __initdata = {
+@@ -594,7 +594,7 @@ static struct cpuidle_state bdw_cstates[] __initdata = {
  		.desc = "MWAIT 0x32",
  		.flags = MWAIT2flg(0x32) | CPUIDLE_FLAG_TLB_FLUSHED,
  		.exit_latency = 166,
@@ -116,7 +116,7 @@ index 3a1617a3e5bf..4f0ac8a9c6ab 100644
  		.enter = &intel_idle,
  		.enter_s2idle = intel_idle_s2idle, },
  	{
-@@ -598,7 +598,7 @@ static struct cpuidle_state bdw_cstates[] __initdata = {
+@@ -602,7 +602,7 @@ static struct cpuidle_state bdw_cstates[] __initdata = {
  		.desc = "MWAIT 0x40",
  		.flags = MWAIT2flg(0x40) | CPUIDLE_FLAG_TLB_FLUSHED,
  		.exit_latency = 300,
@@ -125,7 +125,7 @@ index 3a1617a3e5bf..4f0ac8a9c6ab 100644
  		.enter = &intel_idle,
  		.enter_s2idle = intel_idle_s2idle, },
  	{
-@@ -606,7 +606,7 @@ static struct cpuidle_state bdw_cstates[] __initdata = {
+@@ -610,7 +610,7 @@ static struct cpuidle_state bdw_cstates[] __initdata = {
  		.desc = "MWAIT 0x50",
  		.flags = MWAIT2flg(0x50) | CPUIDLE_FLAG_TLB_FLUSHED,
  		.exit_latency = 600,
@@ -134,7 +134,7 @@ index 3a1617a3e5bf..4f0ac8a9c6ab 100644
  		.enter = &intel_idle,
  		.enter_s2idle = intel_idle_s2idle, },
  	{
-@@ -614,7 +614,7 @@ static struct cpuidle_state bdw_cstates[] __initdata = {
+@@ -618,7 +618,7 @@ static struct cpuidle_state bdw_cstates[] __initdata = {
  		.desc = "MWAIT 0x60",
  		.flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED,
  		.exit_latency = 2600,
@@ -143,7 +143,7 @@ index 3a1617a3e5bf..4f0ac8a9c6ab 100644
  		.enter = &intel_idle,
  		.enter_s2idle = intel_idle_s2idle, },
  	{
-@@ -635,7 +635,7 @@ static struct cpuidle_state skl_cstates[] __initdata = {
+@@ -639,7 +639,7 @@ static struct cpuidle_state skl_cstates[] __initdata = {
  		.desc = "MWAIT 0x01",
  		.flags = MWAIT2flg(0x01) | CPUIDLE_FLAG_ALWAYS_ENABLE,
  		.exit_latency = 10,
@@ -152,7 +152,7 @@ index 3a1617a3e5bf..4f0ac8a9c6ab 100644
  		.enter = &intel_idle,
  		.enter_s2idle = intel_idle_s2idle, },
  	{
-@@ -643,7 +643,7 @@ static struct cpuidle_state skl_cstates[] __initdata = {
+@@ -647,7 +647,7 @@ static struct cpuidle_state skl_cstates[] __initdata = {
  		.desc = "MWAIT 0x10",
  		.flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED,
  		.exit_latency = 70,
@@ -161,7 +161,7 @@ index 3a1617a3e5bf..4f0ac8a9c6ab 100644
  		.enter = &intel_idle,
  		.enter_s2idle = intel_idle_s2idle, },
  	{
-@@ -651,7 +651,7 @@ static struct cpuidle_state skl_cstates[] __initdata = {
+@@ -655,7 +655,7 @@ static struct cpuidle_state skl_cstates[] __initdata = {
  		.desc = "MWAIT 0x20",
  		.flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED,
  		.exit_latency = 85,
@@ -170,7 +170,7 @@ index 3a1617a3e5bf..4f0ac8a9c6ab 100644
  		.enter = &intel_idle,
  		.enter_s2idle = intel_idle_s2idle, },
  	{
-@@ -659,7 +659,7 @@ static struct cpuidle_state skl_cstates[] __initdata = {
+@@ -663,7 +663,7 @@ static struct cpuidle_state skl_cstates[] __initdata = {
  		.desc = "MWAIT 0x33",
  		.flags = MWAIT2flg(0x33) | CPUIDLE_FLAG_TLB_FLUSHED,
  		.exit_latency = 124,
@@ -179,7 +179,7 @@ index 3a1617a3e5bf..4f0ac8a9c6ab 100644
  		.enter = &intel_idle,
  		.enter_s2idle = intel_idle_s2idle, },
  	{
-@@ -667,7 +667,7 @@ static struct cpuidle_state skl_cstates[] __initdata = {
+@@ -671,7 +671,7 @@ static struct cpuidle_state skl_cstates[] __initdata = {
  		.desc = "MWAIT 0x40",
  		.flags = MWAIT2flg(0x40) | CPUIDLE_FLAG_TLB_FLUSHED,
  		.exit_latency = 200,
@@ -188,7 +188,7 @@ index 3a1617a3e5bf..4f0ac8a9c6ab 100644
  		.enter = &intel_idle,
  		.enter_s2idle = intel_idle_s2idle, },
  	{
-@@ -675,7 +675,7 @@ static struct cpuidle_state skl_cstates[] __initdata = {
+@@ -679,7 +679,7 @@ static struct cpuidle_state skl_cstates[] __initdata = {
  		.desc = "MWAIT 0x50",
  		.flags = MWAIT2flg(0x50) | CPUIDLE_FLAG_TLB_FLUSHED,
  		.exit_latency = 480,
@@ -197,7 +197,7 @@ index 3a1617a3e5bf..4f0ac8a9c6ab 100644
  		.enter = &intel_idle,
  		.enter_s2idle = intel_idle_s2idle, },
  	{
-@@ -683,7 +683,7 @@ static struct cpuidle_state skl_cstates[] __initdata = {
+@@ -687,7 +687,7 @@ static struct cpuidle_state skl_cstates[] __initdata = {
  		.desc = "MWAIT 0x60",
  		.flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED,
  		.exit_latency = 890,
@@ -206,7 +206,7 @@ index 3a1617a3e5bf..4f0ac8a9c6ab 100644
  		.enter = &intel_idle,
  		.enter_s2idle = intel_idle_s2idle, },
  	{
-@@ -704,7 +704,7 @@ static struct cpuidle_state skx_cstates[] __initdata = {
+@@ -708,7 +708,7 @@ static struct cpuidle_state skx_cstates[] __initdata = {
  		.desc = "MWAIT 0x01",
  		.flags = MWAIT2flg(0x01) | CPUIDLE_FLAG_ALWAYS_ENABLE,
  		.exit_latency = 10,

0107-bootstats-add-printk-s-to-measure-boot-time-in-more-.patch

@@ -13,7 +13,7 @@ Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
-index cd6be6f143e8..6eaee26ab3b4 100644
+index 2400ad62f330..899eb4b13696 100644
 --- a/arch/x86/kernel/alternative.c
 +++ b/arch/x86/kernel/alternative.c
 @@ -723,7 +723,9 @@ void __init alternative_instructions(void)

0108-smpboot-reuse-timer-calibration.patch

@@ -10,7 +10,7 @@ saves 200ms+ of boot time.
  1 file changed, 3 insertions(+)
 
 diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
-index 49d925043171..704733712ec4 100644
+index f70dffc2771f..dfb9f60554af 100644
 --- a/arch/x86/kernel/tsc.c
 +++ b/arch/x86/kernel/tsc.c
 @@ -1546,6 +1546,9 @@ unsigned long calibrate_delay_is_known(void)

0111-ipv4-tcp-allow-the-memory-tuning-for-tcp-to-go-a-lit.patch

@@ -9,10 +9,10 @@ Subject: [PATCH] ipv4/tcp: allow the memory tuning for tcp to go a little
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
-index 001e16ee1506..a4ab10beb872 100644
+index b2bc3d7fe9e8..8050e8cc72b3 100644
 --- a/net/ipv4/tcp.c
 +++ b/net/ipv4/tcp.c
-@@ -4183,8 +4183,8 @@ void __init tcp_init(void)
+@@ -4186,8 +4186,8 @@ void __init tcp_init(void)
  	tcp_init_mem();
  	/* Set per-socket limits to no more than 1/128 the pressure threshold */
  	limit = nr_free_buffer_pages() << (PAGE_SHIFT - 7);

0114-print-fsync-count-for-bootchart.patch

@@ -10,10 +10,10 @@ Subject: [PATCH] print fsync count for bootchart
  3 files changed, 5 insertions(+)
 
 diff --git a/block/blk-core.c b/block/blk-core.c
-index 0014e7caae3d..9ca17c858f41 100644
+index 2db8bda43b6e..6f049d7e8d2f 100644
 --- a/block/blk-core.c
 +++ b/block/blk-core.c
-@@ -1251,6 +1251,9 @@ blk_qc_t submit_bio(struct bio *bio)
+@@ -1098,6 +1098,9 @@ blk_qc_t submit_bio(struct bio *bio)
  			count_vm_events(PGPGIN, count);
  		}
 
@@ -24,10 +24,10 @@ index 0014e7caae3d..9ca17c858f41 100644
  			char b[BDEVNAME_SIZE];
  			printk(KERN_DEBUG "%s(%d): %s block %Lu on %s (%u sectors)\n",
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 12aa57de8eea..b7cac851a2e9 100644
+index 76cd21fa5501..f413624548fb 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
-@@ -924,6 +924,7 @@ struct task_struct {
+@@ -932,6 +932,7 @@ struct task_struct {
  	/* Cached requested key. */
  	struct key			*cached_requested_key;
  #endif
@@ -36,10 +36,10 @@ index 12aa57de8eea..b7cac851a2e9 100644
  	/*
  	 * executable name, excluding path.
 diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
-index 36c54265bb2b..acbdf8f3ffd9 100644
+index 2357921580f9..57efe4a41a50 100644
 --- a/kernel/sched/debug.c
 +++ b/kernel/sched/debug.c
-@@ -876,6 +876,7 @@ void proc_sched_show_task(struct task_struct *p, struct pid_namespace *ns,
+@@ -930,6 +930,7 @@ void proc_sched_show_task(struct task_struct *p, struct pid_namespace *ns,
  	PN(se.exec_start);
  	PN(se.vruntime);
  	PN(se.sum_exec_runtime);

0115-add-boot-option-to-allow-unsigned-modules.patch

@@ -14,18 +14,18 @@ Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>
  1 file changed, 20 insertions(+)
 
 diff --git a/kernel/module.c b/kernel/module.c
-index cc9281398f69..4bf2b3807976 100644
+index e20499309b2a..b4fa958ed098 100644
 --- a/kernel/module.c
 +++ b/kernel/module.c
-@@ -56,6 +56,7 @@
+@@ -57,6 +57,7 @@
  #include <linux/bsearch.h>
  #include <linux/dynamic_debug.h>
  #include <linux/audit.h>
 +#include <linux/efi.h>
  #include <uapi/linux/module.h>
  #include "module-internal.h"
 
-@@ -273,6 +274,10 @@ static void module_assert_mutex_or_preempt(void)
+@@ -274,6 +275,10 @@ static void module_assert_mutex_or_preempt(void)
 
  static bool sig_enforce = IS_ENABLED(CONFIG_MODULE_SIG_FORCE);
  module_param(sig_enforce, bool_enable_only, 0644);
@@ -36,7 +36,7 @@ index cc9281398f69..4bf2b3807976 100644
 
  /*
   * Export sig_enforce kernel cmdline parameter to allow other subsystems rely
-@@ -398,6 +403,8 @@ extern const s32 __start___kcrctab_unused[];
+@@ -399,6 +404,8 @@ extern const s32 __start___kcrctab_unused[];
  extern const s32 __start___kcrctab_unused_gpl[];
  #endif
 
@@ -45,7 +45,7 @@ index cc9281398f69..4bf2b3807976 100644
  #ifndef CONFIG_MODVERSIONS
  #define symversion(base, idx) NULL
  #else
-@@ -4436,6 +4443,19 @@ static const struct proc_ops modules_proc_ops = {
+@@ -4459,6 +4466,19 @@ static const struct proc_ops modules_proc_ops = {
  static int __init proc_modules_init(void)
  {
  	proc_create("modules", 0, NULL, &modules_proc_ops);

0116-enable-stateless-firmware-loading.patch

@@ -11,10 +11,10 @@ firmware and distribution firmware.
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c
-index b0ec2721f55d..b500bf53919c 100644
+index 78355095e00d..7e2c79e2a88b 100644
 --- a/drivers/base/firmware_loader/main.c
 +++ b/drivers/base/firmware_loader/main.c
-@@ -444,6 +444,8 @@ static int fw_decompress_xz(struct device *dev, struct fw_priv *fw_priv,
+@@ -465,6 +465,8 @@ static int fw_decompress_xz(struct device *dev, struct fw_priv *fw_priv,
  static char fw_path_para[256];
  static const char * const fw_path[] = {
  	fw_path_para,

0118-xattr-allow-setting-user.-attributes-on-symlinks-by-.patch

@@ -23,7 +23,7 @@ Signed-off-by: Alan Cox <alan@linux.intel.com>
  1 file changed, 8 insertions(+), 6 deletions(-)
 
 diff --git a/fs/xattr.c b/fs/xattr.c
-index 386b45676d7e..cabada890bae 100644
+index cd7a563e8bcd..c7ec484b5499 100644
 --- a/fs/xattr.c
 +++ b/fs/xattr.c
 @@ -119,15 +119,17 @@ xattr_permission(struct inode *inode, const char *name, int mask)

0119-add-scheduler-turbo3-patch.patch

@@ -41,10 +41,10 @@ index 1afbdd1dd777..d828ecf6bce7 100644
  	}
  }
 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
-index 1c39dda88136..1fedbb062bf5 100644
+index ae7ceba8fd4f..8ab3b2753278 100644
 --- a/kernel/sched/fair.c
 +++ b/kernel/sched/fair.c
-@@ -6670,6 +6670,10 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu)
+@@ -6693,6 +6693,10 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu)
   *
   * preempt must be disabled.
   */
@@ -55,7 +55,7 @@ index 1c39dda88136..1fedbb062bf5 100644
  static int
  select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_flags)
  {
-@@ -6692,6 +6696,21 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_f
+@@ -6715,6 +6719,21 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_f
  		want_affine = !wake_wide(p) && cpumask_test_cpu(cpu, p->cpus_ptr);
  	}