Subject: linux-next: build failure after merge of the thermal tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 8 Oct 2012 11:02:05 +1100

Hi Zhang,

After merging the thermal tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/thermal/cpu_cooling.c: In function 'get_idr':
drivers/thermal/cpu_cooling.c:89:14: error: 'MAX_ID_MASK' undeclared (first use in this function)

Caused by commit 023614183768 ("thermal: add generic cpufreq cooling
implementation") interacting with commit 125c4c706b68 ("idr: rename
MAX_LEVEL to MAX_IDR_LEVEL") which very recently entered Linus' tree.

I have applied the following fix patch for today:

From: Stephen Rothwell <[email-masked]>
Date: Mon, 8 Oct 2012 10:56:56 +1100
Subject: [PATCH] thermal: fix for for MAX_ID_MASK to MAX_IDR_MASK rename

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 drivers/thermal/cpu_cooling.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
index 9050c1b..cc1c930 100644
--- a/drivers/thermal/cpu_cooling.c
+++ b/drivers/thermal/cpu_cooling.c
@@ -86,7 +86,7 @@ again:
 	else if (unlikely(err))
 		return err;
 
-	*id = *id & MAX_ID_MASK;
+	*id = *id & MAX_IDR_MASK;
 	return 0;
 }
 
-- 
1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwell                    [email-masked]