Skip to content
Permalink
Browse files
Revert "Fix cpufreq_cooling build."
Fix error below.

kernel/sched/MuQSS.c:3408:6: error: conflicting types for ‘arch_set_thermal_pressure’
 3408 | void arch_set_thermal_pressure(struct cpumask *cpus,
      |      ^~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ./include/linux/energy_model.h:10,
                 from ./include/linux/device.h:16,
                 from ./include/linux/node.h:18,
                 from ./include/linux/cpu.h:17,
                 from ./include/linux/perf_event.h:50,
                 from ./include/linux/trace_events.h:10,
                 from ./include/trace/trace_events.h:21,
                 from ./include/trace/define_trace.h:102,
                 from ./include/trace/events/sched.h:652,
                 from kernel/sched/MuQSS.c:35:
./include/linux/sched/topology.h:247:6: note: previous definition of ‘arch_set_thermal_pressure’ was here
  247 | void arch_set_thermal_pressure(const struct cpumask *cpus,
      |      ^~~~~~~~~~~~~~~~~~~~~~~~~

This reverts commit 89377b9.
  • Loading branch information
damentz committed Nov 7, 2020
1 parent 8969d3b commit bb2916b2fc9b8433563583c67044135c9cfad84e
Showing 1 changed file with 0 additions and 11 deletions.
@@ -3403,17 +3403,6 @@ static inline u64 do_task_delta_exec(struct task_struct *p, struct rq *rq)
return ns;
}

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);
}

/*
* Return accounted runtime for the task.
* Return separately the current's pending runtime that have not been

0 comments on commit bb2916b

Please sign in to comment.