OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
68c45a2da3
linux/drivers/thermal
History
Linus Torvalds 19cc90f58d Fix mis-merge of intel_powerclamp.c resulting in compile error 
The new intel_powerclamp thermal cooling device driver was merged in
commit 2af78448ff (Pull thermal management updates from Zhang Rui)
without any data conflicts.  But there was a more subtle conflict I
missed: the driver uses MAX_USER_RT_PRIO, but commit 8bd75c77b7
("sched/rt: Move rt specific bits into new header file") had moved that
define from <linux/sched.h> to <linux/sched/rt.h>.

Which caused this build failure:

  drivers/thermal/intel_powerclamp.c: In function ‘clamp_thread’:
  drivers/thermal/intel_powerclamp.c:360:21: error: ‘MAX_USER_RT_PRIO’ undeclared (first use in this function)
  drivers/thermal/intel_powerclamp.c:360:21: note: each undeclared identifier is reported only once for each function it appears in

And because I don't do a full "make allmodconfig" build after each pull,
I didn't notice until too late.  So now the fix is here, separately from
the merge commit.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 20:23:09 -08:00
..
cpu_cooling.c Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux 2013-02-28 19:48:26 -08:00
db8500_cpufreq_cooling.c thermal: db8500: Use of_match_ptr() macro in db8500_cpufreq_cooling.c 2013-01-04 15:40:03 +08:00
db8500_thermal.c thermal: db8500: Use of_match_ptr() macro in db8500_thermal.c 2013-01-04 15:39:32 +08:00
dove_thermal.c Thermal: Dove: Add Themal sensor support for Dove. 2013-02-08 20:26:02 +08:00
exynos_thermal.c Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux 2013-02-28 19:48:26 -08:00
fair_share.c
intel_powerclamp.c Fix mis-merge of intel_powerclamp.c resulting in compile error 2013-02-28 20:23:09 -08:00
Kconfig Thermal: rename thermal governor Kconfig option to avoid generic naming 2013-02-08 20:33:42 +08:00
kirkwood_thermal.c thermal: Add support for the thermal sensor on Kirkwood SoCs 2013-02-08 20:25:56 +08:00
Makefile Thermal: rename thermal governor Kconfig option to avoid generic naming 2013-02-08 20:33:42 +08:00
rcar_thermal.c thermal: rcar: remove __devinitconst 2013-02-22 17:38:40 +08:00
spear_thermal.c drivers/thermal/spear_thermal.c: use devm_clk_get 2013-01-04 15:38:25 +08:00
step_wise.c step_wise: Unify the code for both throttle and dethrottle 2013-01-04 15:22:37 +08:00
thermal_core.h
thermal_sys.c Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux 2013-02-28 19:48:26 -08:00
user_space.c