6.1.y: Update defconfig and Project C fixups.
Fixes https://github.com/Frogging-Family/linux-tkg/issues/803
This commit is contained in:
@@ -1,15 +1,15 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Linux/x86 6.1.23 Kernel Configuration
|
# Linux/x86 6.1.53 Kernel Configuration
|
||||||
#
|
#
|
||||||
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.1 20230201"
|
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.1 20230801"
|
||||||
CONFIG_CC_IS_GCC=y
|
CONFIG_CC_IS_GCC=y
|
||||||
CONFIG_GCC_VERSION=120201
|
CONFIG_GCC_VERSION=130201
|
||||||
CONFIG_CLANG_VERSION=0
|
CONFIG_CLANG_VERSION=0
|
||||||
CONFIG_AS_IS_GNU=y
|
CONFIG_AS_IS_GNU=y
|
||||||
CONFIG_AS_VERSION=24000
|
CONFIG_AS_VERSION=24100
|
||||||
CONFIG_LD_IS_BFD=y
|
CONFIG_LD_IS_BFD=y
|
||||||
CONFIG_LD_VERSION=24000
|
CONFIG_LD_VERSION=24100
|
||||||
CONFIG_LLD_VERSION=0
|
CONFIG_LLD_VERSION=0
|
||||||
CONFIG_CC_CAN_LINK=y
|
CONFIG_CC_CAN_LINK=y
|
||||||
CONFIG_CC_CAN_LINK_STATIC=y
|
CONFIG_CC_CAN_LINK_STATIC=y
|
||||||
@@ -17,7 +17,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
|
|||||||
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
|
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
|
||||||
CONFIG_CC_HAS_ASM_INLINE=y
|
CONFIG_CC_HAS_ASM_INLINE=y
|
||||||
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
|
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
|
||||||
CONFIG_PAHOLE_VERSION=124
|
CONFIG_PAHOLE_VERSION=125
|
||||||
CONFIG_IRQ_WORK=y
|
CONFIG_IRQ_WORK=y
|
||||||
CONFIG_BUILDTIME_TABLE_SORT=y
|
CONFIG_BUILDTIME_TABLE_SORT=y
|
||||||
CONFIG_THREAD_INFO_IN_TASK=y
|
CONFIG_THREAD_INFO_IN_TASK=y
|
||||||
@@ -207,7 +207,6 @@ CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
|
|||||||
CONFIG_CC_HAS_INT128=y
|
CONFIG_CC_HAS_INT128=y
|
||||||
CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
|
CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
|
||||||
CONFIG_GCC11_NO_ARRAY_BOUNDS=y
|
CONFIG_GCC11_NO_ARRAY_BOUNDS=y
|
||||||
CONFIG_GCC12_NO_ARRAY_BOUNDS=y
|
|
||||||
CONFIG_CC_NO_ARRAY_BOUNDS=y
|
CONFIG_CC_NO_ARRAY_BOUNDS=y
|
||||||
CONFIG_ARCH_SUPPORTS_INT128=y
|
CONFIG_ARCH_SUPPORTS_INT128=y
|
||||||
CONFIG_NUMA_BALANCING=y
|
CONFIG_NUMA_BALANCING=y
|
||||||
@@ -532,7 +531,9 @@ CONFIG_RETHUNK=y
|
|||||||
CONFIG_CPU_UNRET_ENTRY=y
|
CONFIG_CPU_UNRET_ENTRY=y
|
||||||
CONFIG_CPU_IBPB_ENTRY=y
|
CONFIG_CPU_IBPB_ENTRY=y
|
||||||
CONFIG_CPU_IBRS_ENTRY=y
|
CONFIG_CPU_IBRS_ENTRY=y
|
||||||
|
CONFIG_CPU_SRSO=y
|
||||||
CONFIG_SLS=y
|
CONFIG_SLS=y
|
||||||
|
# CONFIG_GDS_FORCE_MITIGATION is not set
|
||||||
CONFIG_ARCH_HAS_ADD_PAGES=y
|
CONFIG_ARCH_HAS_ADD_PAGES=y
|
||||||
CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
|
CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
|
||||||
|
|
||||||
@@ -778,6 +779,7 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
|
|||||||
CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
|
CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
|
||||||
CONFIG_ARCH_HAS_SET_MEMORY=y
|
CONFIG_ARCH_HAS_SET_MEMORY=y
|
||||||
CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
|
CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
|
||||||
|
CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y
|
||||||
CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
|
CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
|
||||||
CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
|
CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
|
||||||
CONFIG_ARCH_WANTS_NO_INSTR=y
|
CONFIG_ARCH_WANTS_NO_INSTR=y
|
||||||
@@ -1137,6 +1139,7 @@ CONFIG_PTE_MARKER_UFFD_WP=y
|
|||||||
CONFIG_LRU_GEN=y
|
CONFIG_LRU_GEN=y
|
||||||
CONFIG_LRU_GEN_ENABLED=y
|
CONFIG_LRU_GEN_ENABLED=y
|
||||||
# CONFIG_LRU_GEN_STATS is not set
|
# CONFIG_LRU_GEN_STATS is not set
|
||||||
|
CONFIG_LOCK_MM_AND_FIND_VMA=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# Data Access Monitoring
|
# Data Access Monitoring
|
||||||
@@ -6178,10 +6181,7 @@ CONFIG_MEDIA_ATTACH=y
|
|||||||
# IR I2C driver auto-selected by 'Autoselect ancillary drivers'
|
# IR I2C driver auto-selected by 'Autoselect ancillary drivers'
|
||||||
#
|
#
|
||||||
CONFIG_VIDEO_IR_I2C=m
|
CONFIG_VIDEO_IR_I2C=m
|
||||||
|
CONFIG_VIDEO_CAMERA_SENSOR=y
|
||||||
#
|
|
||||||
# Camera sensor devices
|
|
||||||
#
|
|
||||||
CONFIG_VIDEO_APTINA_PLL=m
|
CONFIG_VIDEO_APTINA_PLL=m
|
||||||
CONFIG_VIDEO_CCS_PLL=m
|
CONFIG_VIDEO_CCS_PLL=m
|
||||||
CONFIG_VIDEO_AR0521=m
|
CONFIG_VIDEO_AR0521=m
|
||||||
@@ -6247,7 +6247,6 @@ CONFIG_VIDEO_VS6624=m
|
|||||||
CONFIG_VIDEO_CCS=m
|
CONFIG_VIDEO_CCS=m
|
||||||
CONFIG_VIDEO_ET8EK8=m
|
CONFIG_VIDEO_ET8EK8=m
|
||||||
CONFIG_VIDEO_M5MOLS=m
|
CONFIG_VIDEO_M5MOLS=m
|
||||||
# end of Camera sensor devices
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Lens drivers
|
# Lens drivers
|
||||||
@@ -8847,8 +8846,8 @@ CONFIG_FUJITSU_TABLET=m
|
|||||||
CONFIG_GPD_POCKET_FAN=m
|
CONFIG_GPD_POCKET_FAN=m
|
||||||
CONFIG_X86_PLATFORM_DRIVERS_HP=y
|
CONFIG_X86_PLATFORM_DRIVERS_HP=y
|
||||||
CONFIG_HP_ACCEL=m
|
CONFIG_HP_ACCEL=m
|
||||||
CONFIG_WIRELESS_HOTKEY=m
|
|
||||||
CONFIG_HP_WMI=m
|
CONFIG_HP_WMI=m
|
||||||
|
CONFIG_WIRELESS_HOTKEY=m
|
||||||
CONFIG_IBM_RTL=m
|
CONFIG_IBM_RTL=m
|
||||||
CONFIG_IDEAPAD_LAPTOP=m
|
CONFIG_IDEAPAD_LAPTOP=m
|
||||||
CONFIG_SENSORS_HDAPS=m
|
CONFIG_SENSORS_HDAPS=m
|
||||||
@@ -10247,7 +10246,7 @@ CONFIG_SMB_SERVER=m
|
|||||||
CONFIG_SMB_SERVER_SMBDIRECT=y
|
CONFIG_SMB_SERVER_SMBDIRECT=y
|
||||||
CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y
|
CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y
|
||||||
CONFIG_SMB_SERVER_KERBEROS5=y
|
CONFIG_SMB_SERVER_KERBEROS5=y
|
||||||
CONFIG_SMBFS_COMMON=m
|
CONFIG_SMBFS=m
|
||||||
CONFIG_CODA_FS=m
|
CONFIG_CODA_FS=m
|
||||||
CONFIG_AFS_FS=m
|
CONFIG_AFS_FS=m
|
||||||
# CONFIG_AFS_DEBUG is not set
|
# CONFIG_AFS_DEBUG is not set
|
||||||
|
@@ -10133,3 +10133,104 @@ index a2d301f58ced..2ccdede8585c 100644
|
|||||||
};
|
};
|
||||||
struct wakeup_test_data *x = data;
|
struct wakeup_test_data *x = data;
|
||||||
|
|
||||||
|
diff --git a/kernel/sched/alt_core.c b/kernel/sched/alt_core.c
|
||||||
|
index 03772805e4f9f1bf881740c8dd14aef667fbecf2..4742bbdfb2d715a439c0d505b4f293a82b76b255 100644
|
||||||
|
--- a/kernel/sched/alt_core.c
|
||||||
|
+++ b/kernel/sched/alt_core.c
|
||||||
|
@@ -5661,9 +5661,6 @@ static int __sched_setscheduler(struct task_struct *p,
|
||||||
|
return retval;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (pi)
|
||||||
|
- cpuset_read_lock();
|
||||||
|
-
|
||||||
|
/*
|
||||||
|
* Make sure no PI-waiters arrive (or leave) while we are
|
||||||
|
* changing the priority of the task:
|
||||||
|
@@ -5709,8 +5706,6 @@ static int __sched_setscheduler(struct task_struct *p,
|
||||||
|
policy = oldpolicy = -1;
|
||||||
|
__task_access_unlock(p, lock);
|
||||||
|
raw_spin_unlock_irqrestore(&p->pi_lock, flags);
|
||||||
|
- if (pi)
|
||||||
|
- cpuset_read_unlock();
|
||||||
|
goto recheck;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -5741,10 +5736,8 @@ static int __sched_setscheduler(struct task_struct *p,
|
||||||
|
__task_access_unlock(p, lock);
|
||||||
|
raw_spin_unlock_irqrestore(&p->pi_lock, flags);
|
||||||
|
|
||||||
|
- if (pi) {
|
||||||
|
- cpuset_read_unlock();
|
||||||
|
+ if (pi)
|
||||||
|
rt_mutex_adjust_pi(p);
|
||||||
|
- }
|
||||||
|
|
||||||
|
/* Run balance callbacks after we've adjusted the PI chain: */
|
||||||
|
balance_callbacks(rq, head);
|
||||||
|
@@ -5755,8 +5748,6 @@ static int __sched_setscheduler(struct task_struct *p,
|
||||||
|
unlock:
|
||||||
|
__task_access_unlock(p, lock);
|
||||||
|
raw_spin_unlock_irqrestore(&p->pi_lock, flags);
|
||||||
|
- if (pi)
|
||||||
|
- cpuset_read_unlock();
|
||||||
|
return retval;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
|
||||||
|
index 2f6606f4a3ec941f78b85a8ff997f2a6c0405218..71f5da268ee8e597ee15b2b440b4a80f8a6adb1c 100644
|
||||||
|
--- a/kernel/cgroup/cpuset.c
|
||||||
|
+++ b/kernel/cgroup/cpuset.c
|
||||||
|
@@ -2509,12 +2509,15 @@ static int cpuset_can_attach(struct cgroup_taskset *tset)
|
||||||
|
if (ret)
|
||||||
|
goto out_unlock;
|
||||||
|
|
||||||
|
+#ifndef CONFIG_SCHED_ALT
|
||||||
|
if (dl_task(task)) {
|
||||||
|
cs->nr_migrate_dl_tasks++;
|
||||||
|
cs->sum_migrate_dl_bw += task->dl.dl_bw;
|
||||||
|
}
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifndef CONFIG_SCHED_ALT
|
||||||
|
if (!cs->nr_migrate_dl_tasks)
|
||||||
|
goto out_success;
|
||||||
|
|
||||||
|
@@ -2535,6 +2538,7 @@ static int cpuset_can_attach(struct cgroup_taskset *tset)
|
||||||
|
}
|
||||||
|
|
||||||
|
out_success:
|
||||||
|
+#endif
|
||||||
|
/*
|
||||||
|
* Mark attach is in progress. This makes validate_change() fail
|
||||||
|
* changes which zero cpus/mems_allowed.
|
||||||
|
@@ -2558,12 +2562,14 @@ static void cpuset_cancel_attach(struct cgroup_taskset *tset)
|
||||||
|
if (!cs->attach_in_progress)
|
||||||
|
wake_up(&cpuset_attach_wq);
|
||||||
|
|
||||||
|
+#ifndef CONFIG_SCHED_ALT
|
||||||
|
if (cs->nr_migrate_dl_tasks) {
|
||||||
|
int cpu = cpumask_any(cs->effective_cpus);
|
||||||
|
|
||||||
|
dl_bw_free(cpu, cs->sum_migrate_dl_bw);
|
||||||
|
reset_migrate_dl_data(cs);
|
||||||
|
}
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
mutex_unlock(&cpuset_mutex);
|
||||||
|
}
|
||||||
|
diff --git a/kernel/sched/alt_core.c b/kernel/sched/alt_core.c
|
||||||
|
index 4742bbdfb2d715a439c0d505b4f293a82b76b255..8badb54c7d7b00bba30dbbd7206feeafbf919af2 100644
|
||||||
|
--- a/kernel/sched/alt_core.c
|
||||||
|
+++ b/kernel/sched/alt_core.c
|
||||||
|
@@ -7156,8 +7156,7 @@ int cpuset_cpumask_can_shrink(const struct cpumask __maybe_unused *cur,
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
-int task_can_attach(struct task_struct *p,
|
||||||
|
- const struct cpumask *cs_effective_cpus)
|
||||||
|
+int task_can_attach(struct task_struct *p)
|
||||||
|
{
|
||||||
|
int ret = 0;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user