diff --git a/PKGBUILD b/PKGBUILD index 0a509c1..50ffd65 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -59,7 +59,7 @@ else fi pkgname=("${pkgbase}" "${pkgbase}-headers") pkgver="${_basekernel}"."${_sub}" -pkgrel=240 +pkgrel=241 pkgdesc='Linux-tkg' arch=('x86_64') # no i686 in here url="http://www.kernel.org/" @@ -102,7 +102,7 @@ case $_basever in 0012-linux-hardened.patch ) sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491' - '00db8c0e33f631ea9a50a99f1e08ab79258dd819258c98beace9e154835eb49f' + '8b704f72b25f3fe60612c7a53b87a21938365f26b03beb55bb674e4caf68b909' #'SKIP' 'b0c4c60669f47ba4d3d1388368a5f9790aa697af42c917ed2ef177f111336d8b' '1f4a20d6eaaa0d969af93152a65191492400c6aa838fc1c290b0dd29bb6019d8' @@ -118,11 +118,11 @@ case $_basever in '815974c65f47301d2a5d1577bf95e8a4b54cad7d77f226e0065f83e763837c48' '62496f9ca788996181ef145f96ad26291282fcc3fb95cdc04080dcf84365be33' 'eac7e5d6201528e64f4bdf5e286c842511e1afc52e1518dc8e7d11932bbe0a99' - 'db03fbd179ec78941eefe1c0edde4c19071bc603511d0b5c06c04e412994b62e' + '29f7dc8930426b9cf86742ca80623b96b97c1d92a4436ba4e2adcde5200b4c29' '19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a' '2d9260b80b43bbd605cf420d6bd53aa7262103dfd77196ba590ece5600b6dc0d' '3832f828a9f402b153fc9a6829c5a4eaf6091804bcda3a0423c8e1b57e26420d' - '6a6a736cf1b3513d108bfd36f60baf50bb36b33aec21ab0d0ffad13602b7ff75' + 'c98befca824f761260466410a1dd94d2b9be6f7211b5daefcfc0f3a102bbdc81' 'aeb31404c26ee898d007b1f66cb9572c9884ad8eca14edc4587d68f6cba6de46') ;; 57) @@ -319,7 +319,7 @@ case $_basever in 0012-misc-additions.patch ) sha256sums=('dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43' - '04b1fcebcc2eb5ecfe79520859c602b4f0a879919bdd4d15b34e2d892fc86c36' + '21301888341f619e423e66b7c23aeaf69d016ea30d860503a7fe2117668be557' 'SKIP' 'f2d15531096e97239a67f7642d85666a2f27c5e053b38ff9a2aa704dfc388f8a' 'eb1da1a028a1c967222b5bdac1db2b2c4d8285bafd714892f6fc821c10416341' @@ -335,7 +335,7 @@ case $_basever in 'e00096244e5cddaa5500d08b5f692fd3f25be9401dfa3b0fc624625ff2f5e198' '62496f9ca788996181ef145f96ad26291282fcc3fb95cdc04080dcf84365be33' '31b428c464905e44ed61cdcd1f42b4ec157ebe5a44cb5b608c4c99b466df66ba' - '6c2c13a8c21e1ff4ca8396c3f70713e493c24da0711b27ab3cb77189760d04d4' + 'd29895468e2113538db457282e6d7a8ca6afec7c4bac5d98811f70fe1cdc333b' 'fca63d15ca4502aebd73e76d7499b243d2c03db71ff5ab0bf5cf268b2e576320' '19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a' 'b302ba6c5bbe8ed19b20207505d513208fae1e678cf4d8e7ac0b154e5fe3f456' @@ -344,7 +344,7 @@ case $_basever in '377d0eb1df251808b8280d1aec598b4a2986f7d167306cdec9048c337cdcf2e1' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' 'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911' - '1a1b9470949e82446b9888d6eccaea5e98b61ec2e12b13fc6d23ff4134dce92d' + 'b9da77449157c36193d4dc8a43f4cebe7f13d9f6bbcdadbcbf1e61da1f5f887e' '105f51e904d80f63c1421203e093b612fc724edefd3e388b64f8d371c0b3a842' '7fb1104c167edb79ec8fbdcde97940ed0f806aa978bdd14d0c665a1d76d25c24') ;; @@ -637,7 +637,7 @@ case $_basever in 0002-mm-Support-soft-dirty-flag-read-with-reset.patch ) sha256sums=('57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8' - '0817171996521675b3c1130568503f08d8b1672c955cc842200a21bf5914cd95' + '3fa49979ba93d0de87d8168dc80786c7a6bfab718accb7c22e5a034e1bfb7e30' 'SKIP' '6000b247aac5620ba08ec862353063f5f8806a33c4c8f55263843c8f47027e63' '5786bbcc3f655592958ba7011f9ce361d69211b0478c5b86bd3e600fee3ffd27' @@ -657,7 +657,7 @@ case $_basever in '68659b54bd0c0539c22869feea8017faf947af6883d75c00089f2bfd9f265f8e' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' '978b197efa56781a1d5651a3649c3d8b926d55748b4b9063788dfe1a861fc1bc' - '768239d739180c0199545b5c5cf2d78de6261aec769008e6a2b7e97c7477b756' + 'd11edf802031e9335e4236ea1bb56d7fff9f6159dbc5f0afe407256b95d601fc' 'c010206dc3278d2652afebaed9fac58e55e65f65deb0565687faa1dec577494b' '434e4707efc1bc3919597c87d44fa537f7563ae04236479bbf1adb5f410ab69d' '1b656ad96004f27e9dc63d7f430b50d5c48510d6d4cd595a81c24b21adb70313' @@ -695,7 +695,7 @@ case $_basever in 0002-mm-Support-soft-dirty-flag-read-with-reset.patch ) sha256sums=('027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb' - '3a09c2f1ad410c09cf03921abeed1a6ca7c38138fb508171ee673d429d179171' + '162febfc2af27a8558124c80417c95e85b37ed5df3061287a002f977e6896240' 'SKIP' 'c1445d77355dc742f7690748d33c289ad7fd380c7aa66230ebf85d298c072729' '1e15fc2ef3fa770217ecc63a220e5df2ddbcf3295eb4a021171e7edd4c6cc898' @@ -712,7 +712,7 @@ case $_basever in 'f91223f98f132602a4fa525917a1f27afe30bdb55a1ac863e739c536188417b3' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' 'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911' - 'e1b150ff3e7dfd63a7f98c4acbd036e94cc736026cda9d679e9d79dbab265d27' + '5045d280e047a035d44df659fc389de5f97f5dde6aa179dab65658fcd90bfd71' #'decd4a55c0d47b1eb808733490cdfea1207a2022d46f06d04a3cc60fdcb3f32c' '1aa0a172e1e27fb8171053f3047dcf4a61bd2eda5ea18f02b2bb391741a69887' '1b656ad96004f27e9dc63d7f430b50d5c48510d6d4cd595a81c24b21adb70313' diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare index a825769..3d37770 100644 --- a/linux-tkg-config/prepare +++ b/linux-tkg-config/prepare @@ -5,17 +5,17 @@ _supported_kernels=("5.17" "5.16" "5.15" "5.14" "5.13" "5.12" "5.11" "5.10" "5.9 typeset -Ag _kver_subver_map _kver_subver_map=( - ["5.4"]="173" + ["5.4"]="174" ["5.7"]="19" ["5.8"]="18" ["5.9"]="16" - ["5.10"]="93" + ["5.10"]="94" ["5.11"]="22" ["5.12"]="19" ["5.13"]="19" ["5.14"]="21" - ["5.15"]="16" - ["5.16"]="2" + ["5.15"]="17" + ["5.16"]="3" ["5.17"]="rc1" ) diff --git a/linux-tkg-patches/5.10/0005-v5.10_undead-pds099o.patch b/linux-tkg-patches/5.10/0005-v5.10_undead-pds099o.patch index eaed11a..bc03788 100644 --- a/linux-tkg-patches/5.10/0005-v5.10_undead-pds099o.patch +++ b/linux-tkg-patches/5.10/0005-v5.10_undead-pds099o.patch @@ -999,7 +999,7 @@ index 5a55d2300452..76b956661488 100644 +#else if (task_nice(p) > 0) { +#endif - cpustat[CPUTIME_NICE] += cputime; + task_group_account_field(p, CPUTIME_NICE, cputime); cpustat[CPUTIME_GUEST_NICE] += cputime; } else { @@ -269,7 +278,7 @@ static inline u64 account_other_time(u64 max) diff --git a/linux-tkg-patches/5.10/0009-prjc_v5.10-r3.patch b/linux-tkg-patches/5.10/0009-prjc_v5.10-r3.patch index 29f9b8f..f3e8451 100644 --- a/linux-tkg-patches/5.10/0009-prjc_v5.10-r3.patch +++ b/linux-tkg-patches/5.10/0009-prjc_v5.10-r3.patch @@ -8111,7 +8111,7 @@ index 5a55d2300452..66a0ab7165f0 100644 /* Add guest time to cpustat. */ - if (task_nice(p) > 0) { + if (task_running_nice(p)) { - cpustat[CPUTIME_NICE] += cputime; + task_group_account_field(p, CPUTIME_NICE, cputime); cpustat[CPUTIME_GUEST_NICE] += cputime; } else { @@ -269,7 +269,7 @@ static inline u64 account_other_time(u64 max) diff --git a/linux-tkg-patches/5.15/0009-prjc_v5.15-r1.patch b/linux-tkg-patches/5.15/0009-prjc_v5.15-r1.patch index 5886349..0fe6430 100644 --- a/linux-tkg-patches/5.15/0009-prjc_v5.15-r1.patch +++ b/linux-tkg-patches/5.15/0009-prjc_v5.15-r1.patch @@ -9187,7 +9187,7 @@ index 872e481d5098..f920c8b48ec1 100644 /* Add guest time to cpustat. */ - if (task_nice(p) > 0) { + if (task_running_nice(p)) { - cpustat[CPUTIME_NICE] += cputime; + task_group_account_field(p, CPUTIME_NICE, cputime); cpustat[CPUTIME_GUEST_NICE] += cputime; } else { @@ -270,7 +270,7 @@ static inline u64 account_other_time(u64 max) diff --git a/linux-tkg-patches/5.16/0009-prjc_v5.16-r0.patch b/linux-tkg-patches/5.16/0009-prjc_v5.16-r0.patch index 2ed57a2..fabc51d 100644 --- a/linux-tkg-patches/5.16/0009-prjc_v5.16-r0.patch +++ b/linux-tkg-patches/5.16/0009-prjc_v5.16-r0.patch @@ -9210,7 +9210,7 @@ index 9392aea1804e..c1ead972e498 100644 /* Add guest time to cpustat. */ - if (task_nice(p) > 0) { + if (task_running_nice(p)) { - cpustat[CPUTIME_NICE] += cputime; + task_group_account_field(p, CPUTIME_NICE, cputime); cpustat[CPUTIME_GUEST_NICE] += cputime; } else { @@ -270,7 +270,7 @@ static inline u64 account_other_time(u64 max) diff --git a/linux-tkg-patches/5.4/0005-v5.4_undead-pds099o.patch b/linux-tkg-patches/5.4/0005-v5.4_undead-pds099o.patch index e6db1ad..ac66e4f 100644 --- a/linux-tkg-patches/5.4/0005-v5.4_undead-pds099o.patch +++ b/linux-tkg-patches/5.4/0005-v5.4_undead-pds099o.patch @@ -1018,7 +1018,7 @@ index 46ed4e1383e2..0a9548ee995c 100644 +#else if (task_nice(p) > 0) { +#endif - cpustat[CPUTIME_NICE] += cputime; + task_group_account_field(p, CPUTIME_NICE, cputime); cpustat[CPUTIME_GUEST_NICE] += cputime; } else { @@ -269,7 +278,7 @@ static inline u64 account_other_time(u64 max) diff --git a/linux-tkg-patches/5.4/0009-bmq_v5.4-r2.patch b/linux-tkg-patches/5.4/0009-bmq_v5.4-r2.patch index 4d86ca6..ad8e846 100644 --- a/linux-tkg-patches/5.4/0009-bmq_v5.4-r2.patch +++ b/linux-tkg-patches/5.4/0009-bmq_v5.4-r2.patch @@ -7292,7 +7292,7 @@ index 46ed4e1383e2..51460a446da0 100644 /* Add guest time to cpustat. */ - if (task_nice(p) > 0) { + if (task_running_nice(p)) { - cpustat[CPUTIME_NICE] += cputime; + task_group_account_field(p, CPUTIME_NICE, cputime); cpustat[CPUTIME_GUEST_NICE] += cputime; } else { @@ -269,7 +269,7 @@ static inline u64 account_other_time(u64 max)