summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO24
-rw-r--r--.gitignore3
-rw-r--r--02-Glitched-PDS-by-TkG.patch31
-rw-r--r--PKGBUILD6
-rw-r--r--config3
5 files changed, 50 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d0e9378e803..6b69b4155f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-pds
- pkgver = 5.2.8.arch1
+ pkgver = 5.2.9.arch1
pkgrel = 1
- url = https://git.archlinux.org/linux.git/log/?h=v5.2.8-arch1
+ url = https://git.archlinux.org/linux.git/log/?h=v5.2.9-arch1
arch = x86_64
license = GPL2
makedepends = xmlto
@@ -15,7 +15,7 @@ pkgbase = linux-pds
makedepends = graphviz
makedepends = imagemagick
options = !strip
- source = git+https://git.archlinux.org/linux?signed#tag=v5.2.8-arch1
+ source = git+https://git.archlinux.org/linux?signed#tag=v5.2.9-arch1
source = git+https://github.com/graysky2/kernel_gcc_patch
source = config
source = 60-linux.hook
@@ -28,12 +28,12 @@ pkgbase = linux-pds
validpgpkeys = 8218F88849AAC522E94CF470A5E9288C4FA415FA
sha512sums = SKIP
sha512sums = SKIP
- sha512sums = 34570a46bb4cee800923a9b1a50d97927daf1db9eb3a4b080f1626787bd33c65584d160ee4dcedf55cdbd8c2a8ebcab178d8590619fc37ed20c60b1813d424ac
+ sha512sums = 51ed43342e4ba7f4b38b05db77f280138b2d49b4bef3cf216da30436dcb016951240af76178a013c7cd0022ac1d3823eccf8c6012e269134567466cbacc74877
sha512sums = 7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a
sha512sums = 2718b58dbbb15063bacb2bde6489e5b3c59afac4c0e0435b97fe720d42c711b6bcba926f67a8687878bd51373c9cf3adb1915a11666d79ccb220bf36e0788ab7
sha512sums = 2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf
sha512sums = 7345e16b9b8731cb9961823a5e35f6785eaa5759f502d4f7829f5353985e5a27de3cec36752fb1a449d9376af31a4277bce576f0ae4421a8bc28fe21d259af46
- sha512sums = 3ff796cbc213ae5f43a55f1ba92406bba04703db3459040beacacd9baceb3138021e908f440bd101cc76cb725e418ebdc8ab776327801690da30a1477bc84753
+ sha512sums = 86530c273aaff622e0bc13fbf49cd560647c46f1e82bd4162ff8d80075865f715de6236c4a8f850ce20e22e1c7a4f694e347d155e529233d6c124d3b378a10d1
pkgname = linux-pds
pkgdesc = The Linux-pds kernel and modules ~ featuring Alfred Chen's PDS CPU scheduler, rebased by TkG
@@ -44,18 +44,18 @@ pkgname = linux-pds
depends = mkinitcpio
depends = thrash-protect
optdepends = crda: to set the correct wireless channels of your country
- provides = linux-pds=5.2.8.arch1
+ provides = linux-pds=5.2.9.arch1
backup = etc/mkinitcpio.d/linux-pds.preset
pkgname = linux-pds-headers
pkgdesc = Header files and scripts for building modules for Linux-pds kernel ~ featuring Alfred Chen's PDS CPU scheduler, rebased by TkG
- depends = linux-pds=5.2.8.arch1
- provides = linux-pds-headers=5.2.8.arch1
- provides = linux-headers=5.2.8.arch1
+ depends = linux-pds=5.2.9.arch1
+ provides = linux-pds-headers=5.2.9.arch1
+ provides = linux-headers=5.2.9.arch1
pkgname = linux-pds-docs
pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-pds kernel ~ featuring Alfred Chen's PDS CPU scheduler, rebased by TkG
- depends = linux-pds=5.2.8.arch1
- provides = linux-pds-docs=5.2.8.arch1
- provides = linux-docs=5.2.8.arch1
+ depends = linux-pds=5.2.9.arch1
+ provides = linux-pds-docs=5.2.9.arch1
+ provides = linux-docs=5.2.9.arch1
diff --git a/.gitignore b/.gitignore
index 71235bd1a94..e684b01b9ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ kernel_gcc_patch
*.gz
*.pkg.tar*
pkg
-src \ No newline at end of file
+src
+config.last \ No newline at end of file
diff --git a/02-Glitched-PDS-by-TkG.patch b/02-Glitched-PDS-by-TkG.patch
index bb479cdcd6f..bc38f7da3ae 100644
--- a/02-Glitched-PDS-by-TkG.patch
+++ b/02-Glitched-PDS-by-TkG.patch
@@ -162,3 +162,34 @@ index 20dcf19ea057627d91be07b4ec20f0827c30084c..24fa90ca63d144cc4f45d82d88407ea7
enum {
+diff --git a/init/Kconfig b/init/Kconfig
+index 11fd9b502d06..e9bc34d3019b 100644
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -948,7 +948,6 @@ config CGROUP_DEVICE
+
+ config CGROUP_CPUACCT
+ bool "Simple CPU accounting controller"
+- depends on !SCHED_PDS
+ help
+ Provides a simple controller for monitoring the
+ total CPU consumed by the tasks in a cgroup.
+diff --git a/kernel/sched/Makefile b/kernel/sched/Makefile
+index b23231bae996..cab4e5c5b38e 100644
+--- a/kernel/sched/Makefile
++++ b/kernel/sched/Makefile
+@@ -24,13 +24,13 @@ obj-y += fair.o rt.o deadline.o
+ obj-$(CONFIG_SMP) += cpudeadline.o topology.o stop_task.o
+ obj-$(CONFIG_SCHED_AUTOGROUP) += autogroup.o
+ obj-$(CONFIG_SCHED_DEBUG) += debug.o
+-obj-$(CONFIG_CGROUP_CPUACCT) += cpuacct.o
+ endif
+ obj-y += loadavg.o clock.o cputime.o
+ obj-y += idle.o
+ obj-y += wait.o wait_bit.o swait.o completion.o
+ obj-$(CONFIG_SMP) += cpupri.o pelt.o
+ obj-$(CONFIG_SCHEDSTATS) += stats.o
++obj-$(CONFIG_CGROUP_CPUACCT) += cpuacct.o
+ obj-$(CONFIG_CPU_FREQ) += cpufreq.o
+ obj-$(CONFIG_CPU_FREQ_GOV_SCHEDUTIL) += cpufreq_schedutil.o
+ obj-$(CONFIG_MEMBARRIER) += membarrier.o
diff --git a/PKGBUILD b/PKGBUILD
index 17c3f6dcbb0..60a8e14cacb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -67,7 +67,7 @@ _subarch=
_localmodcfg=
pkgbase=linux-pds
-_srcver_tag=5.2.8-arch1
+_srcver_tag=5.2.9-arch1
pkgver="${_srcver_tag//-/.}"
pkgrel=1
arch=(x86_64)
@@ -113,12 +113,12 @@ validpgpkeys=(
)
sha512sums=('SKIP'
'SKIP'
- '34570a46bb4cee800923a9b1a50d97927daf1db9eb3a4b080f1626787bd33c65584d160ee4dcedf55cdbd8c2a8ebcab178d8590619fc37ed20c60b1813d424ac'
+ '51ed43342e4ba7f4b38b05db77f280138b2d49b4bef3cf216da30436dcb016951240af76178a013c7cd0022ac1d3823eccf8c6012e269134567466cbacc74877'
'7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
'2718b58dbbb15063bacb2bde6489e5b3c59afac4c0e0435b97fe720d42c711b6bcba926f67a8687878bd51373c9cf3adb1915a11666d79ccb220bf36e0788ab7'
'2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
'7345e16b9b8731cb9961823a5e35f6785eaa5759f502d4f7829f5353985e5a27de3cec36752fb1a449d9376af31a4277bce576f0ae4421a8bc28fe21d259af46'
- '3ff796cbc213ae5f43a55f1ba92406bba04703db3459040beacacd9baceb3138021e908f440bd101cc76cb725e418ebdc8ab776327801690da30a1477bc84753')
+ '86530c273aaff622e0bc13fbf49cd560647c46f1e82bd4162ff8d80075865f715de6236c4a8f850ce20e22e1c7a4f694e347d155e529233d6c124d3b378a10d1')
_kernelname=${pkgbase#linux}
: ${_kernelname:=-ARCH}
diff --git a/config b/config
index 5a9e12b2cbe..bd036498611 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.2.5-arch1 Kernel Configuration
+# Linux/x86 5.2.9-arch1 Kernel Configuration
#
#
@@ -163,6 +163,7 @@ CONFIG_CGROUP_HUGETLB=y
CONFIG_CPUSETS=y
CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
CONFIG_CGROUP_PERF=y
CONFIG_CGROUP_BPF=y
# CONFIG_CGROUP_DEBUG is not set