linux57-rc-tkg: Fix new BMQ patchset

Merge gone wrong 🐸
This commit is contained in:
Tk-Glitch
2020-05-09 23:31:47 +02:00
parent 360d1238c2
commit 279914e4c0
2 changed files with 12 additions and 12 deletions

View File

@@ -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.