From d82a43f62d9bfab8f665fc431422f893a20accea Mon Sep 17 00:00:00 2001 From: Tk-Glitch Date: Mon, 20 Jul 2020 18:21:10 +0200 Subject: [PATCH] linux58-rc-tkg: Fix compilation with pds --- linux58-rc-tkg/PKGBUILD | 2 +- .../linux58-tkg-patches/0005-v5.8_undead-pds099o.patch | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/linux58-rc-tkg/PKGBUILD b/linux58-rc-tkg/PKGBUILD index 0082c2b..fb1f171 100644 --- a/linux58-rc-tkg/PKGBUILD +++ b/linux58-rc-tkg/PKGBUILD @@ -131,7 +131,7 @@ sha256sums=('87e452905475f28975b2bac9f8d878c53d76c73e6e11d038c488c49e91b88b5a' '7058e57fd68367b029adc77f2a82928f1433daaf02c8c279cb2d13556c8804d7' '62496f9ca788996181ef145f96ad26291282fcc3fb95cdc04080dcf84365be33' '7fd8e776209dac98627453fda754bdf9aff4a09f27cb0b3766d7983612eb3c74' - 'de5140936bad5c6c31f7a1b7d20d3937353cf6e26d2d9bcbbe8930db8cbfc397' + '0731f18ba998743c5759818aeecf05394954efd1cb6ff2ad9946219ce23cd901' '19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a' 'cd225e86d72eaf6c31ef3d7b20df397f4cc44ddd04389850691292cdf292b204' '49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104' diff --git a/linux58-rc-tkg/linux58-tkg-patches/0005-v5.8_undead-pds099o.patch b/linux58-rc-tkg/linux58-tkg-patches/0005-v5.8_undead-pds099o.patch index 4866ed4..a7fe098 100644 --- a/linux58-rc-tkg/linux58-tkg-patches/0005-v5.8_undead-pds099o.patch +++ b/linux58-rc-tkg/linux58-tkg-patches/0005-v5.8_undead-pds099o.patch @@ -7679,7 +7679,7 @@ new file mode 100644 index 000000000000..6c3361f06087 --- /dev/null +++ b/kernel/sched/pds_sched.h -@@ -0,0 +1,573 @@ +@@ -0,0 +1,577 @@ +#ifndef PDS_SCHED_H +#define PDS_SCHED_H + @@ -7853,6 +7853,10 @@ index 000000000000..6c3361f06087 +#endif +}; + ++#define task_contributes_to_load(task) ((task->state & TASK_UNINTERRUPTIBLE) != 0 && \ ++ (task->flags & PF_FROZEN) == 0 && \ ++ (task->state & TASK_NOLOAD) == 0) ++ +extern unsigned long calc_load_update; +extern atomic_long_t calc_load_tasks; +