From 279914e4c048b393ea278574e189794c10ddb72e Mon Sep 17 00:00:00 2001 From: Tk-Glitch Date: Sat, 9 May 2020 23:31:47 +0200 Subject: [PATCH] linux57-rc-tkg: Fix new BMQ patchset Merge gone wrong :frog: --- linux57-rc-tkg/PKGBUILD | 2 +- .../0009-bmq_v5.7-r0.patch | 22 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/linux57-rc-tkg/PKGBUILD b/linux57-rc-tkg/PKGBUILD index d2557ce..dd9191e 100644 --- a/linux57-rc-tkg/PKGBUILD +++ b/linux57-rc-tkg/PKGBUILD @@ -135,7 +135,7 @@ sha256sums=('6bdbef0aa3e1964d84ec388ca40159753b7377291acc6293549188aea2b4d3d6' 'cd225e86d72eaf6c31ef3d7b20df397f4cc44ddd04389850691292cdf292b204' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' '965a517a283f265a012545fbb5cc9e516efc9f6166d2aa1baf7293a32a1086b7' - '486445f9190e99d551d154a55d2db40b0b5e4dda202e7bbee17870a123dfbb8c' + '70c729750e115bc50a61c3ebed20fa7c81867003064470f592084aae8718fe80' '49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104' '7ba451d95d2bc07d983661a7e9602a9b239522c98d42197c706c01905f0efba2') diff --git a/linux57-rc-tkg/linux57-tkg-patches/0009-bmq_v5.7-r0.patch b/linux57-rc-tkg/linux57-tkg-patches/0009-bmq_v5.7-r0.patch index 10181e6..b9b612a 100644 --- a/linux57-rc-tkg/linux57-tkg-patches/0009-bmq_v5.7-r0.patch +++ b/linux57-rc-tkg/linux57-tkg-patches/0009-bmq_v5.7-r0.patch @@ -1318,17 +1318,6 @@ index 000000000000..10560f7720e2 + return; + } + -+DEFINE_PER_CPU(unsigned long, thermal_pressure); -+ -+void arch_set_thermal_pressure(struct cpumask *cpus, -+ unsigned long th_pressure) -+{ -+ int cpu; -+ -+ for_each_cpu(cpu, cpus) -+ WRITE_ONCE(per_cpu(thermal_pressure, cpu), th_pressure); -+} -+ + if (set_nr_and_not_polling(curr)) + smp_send_reschedule(cpu); + else @@ -3390,6 +3379,17 @@ index 000000000000..10560f7720e2 + set_preempt_need_resched(); +} + ++DEFINE_PER_CPU(unsigned long, thermal_pressure); ++ ++void arch_set_thermal_pressure(struct cpumask *cpus, ++ unsigned long th_pressure) ++{ ++ int cpu; ++ ++ for_each_cpu(cpu, cpus) ++ WRITE_ONCE(per_cpu(thermal_pressure, cpu), th_pressure); ++} ++ +/* + * This function gets called by the timer code, with HZ frequency. + * We call it with interrupts disabled.