Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

edac: fix i7core build

Browse source 
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>
This commit is contained in:
Randy Dunlap 2009-11-08 01:36:40 -02:00 committed by Mauro Carvalho Chehab
parent 486dd09f12
commit 3b918c12df
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/edac/i7core_edac.c
View file

@ -25,6 +25,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/pci_ids.h> #include <linux/pci_ids.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/delay.h>
#include <linux/edac.h> #include <linux/edac.h>
#include <linux/mmzone.h> #include <linux/mmzone.h>
#include <linux/edac_mce.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) if (mce->bank != 8)
return 0; return 0;
#ifdef CONFIG_SMP
/* Only handle if it is the right mc controller */ /* Only handle if it is the right mc controller */
if (cpu_data(mce->cpu).phys_proc_id != pvt->i7core_dev->socket) if (cpu_data(mce->cpu).phys_proc_id != pvt->i7core_dev->socket)
return 0; return 0;
#endif
smp_rmb(); smp_rmb();
if ((pvt->mce_out + 1) % MCE_LOG_LEN == pvt->mce_in) { if ((pvt->mce_out + 1) % MCE_LOG_LEN == pvt->mce_in) {