Subject: Re: linux-next: Tree for October 1 (hwmon/pkgtemp)

From: Fenghua Yu <[email-masked]>
Date: Mon, 4 Oct 2010 11:44:45 -0700

On Fri, Oct 01, 2010 at 03:43:14PM -0700, Randy Dunlap wrote:
> On Fri, 1 Oct 2010 15:37:56 +1000 Stephen Rothwell wrote:
> 
> > Hi all,
> > 
> > Changes since 20100930:
> 
> 
> drivers/hwmon/pkgtemp.c:356: error: implicit declaration of function 'cpu_core_mask'
> 
> CONFIG_SMP is not set.
> 
> config is attached.
> 

From: Fenghua Yu <[email-masked]>
Date: Mon, 4 Oct 2010 11:00:36 -0700
Subject: [PATCH] hwmon (pkgtemp): Fix build failure for UP

This fix is only a workaround. Another fix is to add #ifdef CONFIG_SMP around
cpu_core_mask. But the code will not be cleaner than this fix.  This fix is
similar to coretemp in commit fff2017354a3a9906862aabbf2a1cae5b4330e40.

For a real fix, cpu_core_mask() should be defined in UP include code, eg in
linux/smp.h, and asm/smp.h should not be included directly. This fix is
currently not possible because asm/smp.h define cpu_core_mask() unconditionally
and is included directly from many source files.

In the long run, both cpu_sibling_mask and cpu_core_mask will be defined in UP
and this workaround and the workaround in coretemp can be removed.

Reported-by: Randy Dunlap <[email-masked]>
Signed-off-by: Fenghua Yu <[email-masked]>
Cc: Stephen Rothwell <[email-masked]>
Cc: Ingo Molnar <[email-masked]>
Cc: Guenter Roeck <[email-masked]>
---
 drivers/hwmon/pkgtemp.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/hwmon/pkgtemp.c b/drivers/hwmon/pkgtemp.c
index c9f652d..36d96c7 100644
--- a/drivers/hwmon/pkgtemp.c
+++ b/drivers/hwmon/pkgtemp.c
@@ -32,6 +32,7 @@
 #include <linux/list.h>
 #include <linux/platform_device.h>
 #include <linux/cpu.h>
+#include <asm/smp.h>
 #include <asm/msr.h>
 #include <asm/processor.h>
 
-- 
1.6.0.3