aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/edac
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2009-11-07 22:36:40 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-10 10:49:32 -0400
commit3b918c12df4f624140456d6c6f982bada8e1f095 (patch)
treea5a7442d08e5071c286fec36cabf733bb1883ee3 /drivers/edac
parent486dd09f129da01cd02b212ba48dce987488b860 (diff)
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 bd7c727030a3..e944b63d9f06 100644
--- a/drivers/edac/i7core_edac.c
+++ b/drivers/edac/i7core_edac.c
@@ -25,6 +25,7 @@
25#include <linux/pci.h> 25#include <linux/pci.h>
26#include <linux/pci_ids.h> 26#include <linux/pci_ids.h>
27#include <linux/slab.h> 27#include <linux/slab.h>
28#include <linux/delay.h>
28#include <linux/edac.h> 29#include <linux/edac.h>
29#include <linux/mmzone.h> 30#include <linux/mmzone.h>
30#include <linux/edac_mce.h> 31#include <linux/edac_mce.h>
@@ -1696,9 +1697,11 @@ static int i7core_mce_check_error(void *priv, struct mce *mce)
1696 if (mce->bank != 8) 1697 if (mce->bank != 8)
1697 return 0; 1698 return 0;
1698 1699
1700#ifdef CONFIG_SMP
1699 /* Only handle if it is the right mc controller */ 1701 /* Only handle if it is the right mc controller */
1700 if (cpu_data(mce->cpu).phys_proc_id != pvt->i7core_dev->socket) 1702 if (cpu_data(mce->cpu).phys_proc_id != pvt->i7core_dev->socket)
1701 return 0; 1703 return 0;
1704#endif
1702 1705
1703 smp_rmb(); 1706 smp_rmb();
1704 if ((pvt->mce_out + 1) % MCE_LOG_LEN == pvt->mce_in) { 1707 if ((pvt->mce_out + 1) % MCE_LOG_LEN == pvt->mce_in) {