Re: linux-next: build failure after merge of the tip tree

Stephen Rothwell
2013-02-21T02:05:06Z

[-- Attachment #1: Type: text/plain, Size: 1532 bytes --]

Hi all,

On Thu, 14 Feb 2013 13:30:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> 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)
>
> Caused by commit 8bd75c77b7c6 ("sched/rt: Move rt specific bits into new
> header file") interacting with commit d6d71ee4a14a ("PM: Introduce Intel
> PowerClamp Driver") from the thermal tree.
>
> I applied this merge fix patch and can carry it as necessary:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 14 Feb 2013 13:26:22 +1100
> Subject: [PATCH] sched/rt: fix PowerClamp Driver for define move
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/thermal/intel_powerclamp.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/thermal/intel_powerclamp.c b/drivers/thermal/intel_powerclamp.c
> index ab3ed90..b40b37c 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>

The above fix is now needed when the thermal tree is merged with Linus'
tree ...

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]