diff options
-rw-r--r-- | PKGBUILD | 10 | ||||
-rw-r--r-- | patch-4.19-ck1-jcmod2.patch (renamed from patch-4.19-ck1-jcmod1.patch) | 18 |
2 files changed, 13 insertions, 15 deletions
@@ -16,13 +16,13 @@ pkgbase=linux-hardened-ck _majver=4.19 -_minver=7 +_minver=8 _pkgver=${_majver}.${_minver} _hardenedver=a _NUMAdisable=y _ckpatchversion=1 _ckpatchname="patch-${_majver}-ck${_ckpatchversion}" -_jcpatchversion=1 +_jcpatchversion=2 _gcc_more_v='20180509' _srcname=linux-${_pkgver} pkgver=${_pkgver}.${_hardenedver} @@ -50,11 +50,11 @@ source=(https://www.kernel.org/pub/linux/kernel/v4.x/linux-${_pkgver}.tar.xz 90-linux.hook # pacman hook for initramfs regeneration linux.preset # standard config files for mkinitcpio ramdisk ) -sha256sums=('84d7aa436e10690b53165b9d59ec20548e6a4ce3324b135c5019fb0f7dd2a2d2' +sha256sums=('d540d066f307f13f0cfe7e097373cd1af2cc4866b5e36a503775b4e69167e171' 'SKIP' - '5ffa3df9c78dacde20fc72b730837358b6fe2e0a698f67e2767caa50f873ab43' + '6e36f941f608d6cca54f81efc661ea91eb6fc69c58d0dbbbe57d455bb5803f2b' 'SKIP' - 'ace81dad929001a441c028974e1bb014bacabc39d8311efd944fb087dab1436a' + 'c7e090301b6fb3d6f320aeaee6747077ed616ccaf3d22d0d5937d5ea5116ffd8' '226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d' 'e7ebf050c22bcec0028c0b3c79fd6d3913b0370ecc6a23dfe78ce475630cf503' 'b2f07216290c631814f95860779c1b8ee8a58f1807b55dd78e041625599b3138' diff --git a/patch-4.19-ck1-jcmod1.patch b/patch-4.19-ck1-jcmod2.patch index 1d9465a..235d6f6 100644 --- a/patch-4.19-ck1-jcmod1.patch +++ b/patch-4.19-ck1-jcmod2.patch @@ -5351,14 +5351,9 @@ diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 1a0be022f91d..cfa268364ec7 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -1009,10 +1009,26 @@ config SCHED_SMT - depends on SMP - ---help--- - SMT scheduler support improves the CPU scheduler's decision making -- when dealing with Intel Pentium 4 chips with HyperThreading at a -+ when dealing with Intel P4/Core 2 chips with HyperThreading at a - cost of slightly increased overhead in some places. If unsure say - N here. +@@ -1009,6 +1009,21 @@ config NR_CPUS + config SCHED_SMT + def_bool y if SMP +config SMT_NICE + bool "SMT (Hyperthreading) aware nice priority and policy support" @@ -5375,7 +5370,6 @@ index 1a0be022f91d..cfa268364ec7 100644 + + If unsure say Y here. + -+ config SCHED_MC def_bool y prompt "Multi-core scheduler support" @@ -7514,7 +7508,7 @@ new file mode 100644 index 000000000000..02e9eebab3d9 --- /dev/null +++ b/kernel/sched/MuQSS.c -@@ -0,0 +1,7366 @@ +@@ -0,0 +1,7370 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * kernel/sched/MuQSS.c, was kernel/sched.c @@ -8528,6 +8522,10 @@ index 000000000000..02e9eebab3d9 +#define CPUIDLE_THREAD_BUSY (16) +#define CPUIDLE_DIFF_NODE (32) + ++#ifdef CONFIG_SCHED_SMT ++DEFINE_STATIC_KEY_FALSE(sched_smt_present); ++#endif ++ +/* + * The best idle CPU is chosen according to the CPUIDLE ranking above where the + * lowest value would give the most suitable CPU to schedule p onto next. The |