diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-01 05:23:09 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-01 05:23:09 +0100 |
| commit | 19cc90f58d4f2538b4cf5371681a057d2e5209f2 (patch) | |
| tree | 6e77d6faba349101b4d311ad785e722af93ca82d /drivers/thermal | |
| parent | Merge tag 'late-mvebu-rebased' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| download | linux-19cc90f58d4f2538b4cf5371681a057d2e5209f2.tar.xz linux-19cc90f58d4f2538b4cf5371681a057d2e5209f2.zip | |
Fix mis-merge of intel_powerclamp.c resulting in compile error
The new intel_powerclamp thermal cooling device driver was merged in
commit 2af78448fff6 (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 8bd75c77b7c6
("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>
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/intel_powerclamp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/thermal/intel_powerclamp.c b/drivers/thermal/intel_powerclamp.c index ab3ed907d2c3..b40b37cd25e0 100644 --- a/drivers/thermal/intel_powerclamp.c +++ b/drivers/thermal/intel_powerclamp.c @@ -50,6 +50,7 @@ #include <linux/tick.h> #include <linux/debugfs.h> #include <linux/seq_file.h> +#include <linux/sched/rt.h> #include <asm/nmi.h> #include <asm/msr.h> |