summaryrefslogtreecommitdiffstats
path: root/drivers/edac
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2009-11-08 01:36:40 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-10 11:49:32 -0300
commit3b918c12df4f624140456d6c6f982bada8e1f095 (patch)
treea5a7442d08e5071c286fec36cabf733bb1883ee3 /drivers/edac
parent486dd09f129da01cd02b212ba48dce987488b860 (diff)
downloadop-kernel-dev-3b918c12df4f624140456d6c6f982bada8e1f095.zip
op-kernel-dev-3b918c12df4f624140456d6c6f982bada8e1f095.tar.gz
edac: fix i7core build
Fix build warning (missing header file) and build error when CONFIG_SMP=n. drivers/edac/i7core_edac.c:860: error: implicit declaration of function 'msleep' drivers/edac/i7core_edac.c:1700: error: 'struct cpuinfo_x86' has no member named 'phys_proc_id' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/edac')
-rw-r--r--drivers/edac/i7core_edac.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
index bd7c727..e944b63 100644
--- a/drivers/edac/i7core_edac.c
+++ b/drivers/edac/i7core_edac.c
@@ -25,6 +25,7 @@
#include <linux/pci.h>
#include <linux/pci_ids.h>
#include <linux/slab.h>
+#include <linux/delay.h>
#include <linux/edac.h>
#include <linux/mmzone.h>
#include <linux/edac_mce.h>
@@ -1696,9 +1697,11 @@ static int i7core_mce_check_error(void *priv, struct mce *mce)
if (mce->bank != 8)
return 0;
+#ifdef CONFIG_SMP
/* Only handle if it is the right mc controller */
if (cpu_data(mce->cpu).phys_proc_id != pvt->i7core_dev->socket)
return 0;
+#endif
smp_rmb();
if ((pvt->mce_out + 1) % MCE_LOG_LEN == pvt->mce_in) {
OpenPOWER on IntegriCloud