From mboxrd@z Thu Jan 1 00:00:00 1970 From: Fenghua Yu Subject: Re: linux-next: Tree for October 1 (hwmon/pkgtemp) Date: Mon, 4 Oct 2010 11:44:45 -0700 Message-ID: <20101004184445.GA31377@linux-os.sc.intel.com> References: <20101001153756.47b52566.sfr@canb.auug.org.au> <20101001154314.9db0062c.randy.dunlap@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mga02.intel.com ([134.134.136.20]:19334 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755536Ab0JDSor (ORCPT ); Mon, 4 Oct 2010 14:44:47 -0400 Content-Disposition: inline In-Reply-To: <20101001154314.9db0062c.randy.dunlap@oracle.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Randy Dunlap Cc: Stephen Rothwell , "Yu, Fenghua" , "linux-next@vger.kernel.org" , LKML 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 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 Signed-off-by: Fenghua Yu Cc: Stephen Rothwell Cc: Ingo Molnar Cc: Guenter Roeck --- 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 #include #include +#include #include #include -- 1.6.0.3