diff options
author | Guenter Roeck <guenter.roeck@ericsson.com> | 2010-09-28 03:01:49 +0200 |
---|---|---|
committer | Guenter Roeck <guenter.roeck@ericsson.com> | 2010-09-28 13:18:51 +0200 |
commit | fff2017354a3a9906862aabbf2a1cae5b4330e40 (patch) | |
tree | eb95c35c86cd364794b3e77886770831469bd6ee /drivers | |
parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
download | linux-fff2017354a3a9906862aabbf2a1cae5b4330e40.tar.xz linux-fff2017354a3a9906862aabbf2a1cae5b4330e40.zip |
hwmon (coretemp): Fix build breakage if SMP is undefined
Commit e40cc4bdfd4b89813f072f72bd9c7055814d3f0f introduced
a build breakage if CONFIG_SMP is undefined. This commit
fixes the problem.
This fix is only a workaround. For a real fix, cpu_sibling_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 defines
cpu_sibling_mask() unconditionally and is included directly from many source
files.
Reported-by: Ingo Molnar <mingo@elte.hu>
Tested-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/hwmon/coretemp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c index baa842a80b4b..a23b17a78ace 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c @@ -36,6 +36,7 @@ #include <linux/pci.h> #include <asm/msr.h> #include <asm/processor.h> +#include <asm/smp.h> #define DRVNAME "coretemp" |