From: Randy Dunlap <randy.dunlap@oracle•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Mauro Carvalho Chehab <mchehab@redhat•com>
Cc: linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>
Subject: [PATCH] edac: fix i7core build
Date: Wed, 4 Nov 2009 13:57:33 -0800 [thread overview]
Message-ID: <20091104135733.cb878718.randy.dunlap@oracle.com> (raw)
In-Reply-To: <20091104170931.4aa51b77.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle•com>
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>
Cc: Mauro Carvalho Chehab <mchehab@redhat•com>
---
drivers/edac/i7core_edac.c | 3 +++
1 file changed, 3 insertions(+)
--- linux-next-20091104.orig/drivers/edac/i7core_edac.c
+++ linux-next-20091104/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 *
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) {
next prev parent reply other threads:[~2009-11-04 21:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-04 6:09 linux-next: Tree for November 4 Stephen Rothwell
2009-11-04 21:57 ` Randy Dunlap [this message]
2009-11-08 3:45 ` [PATCH] edac: fix i7core build Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091104135733.cb878718.randy.dunlap@oracle.com \
--to=randy.dunlap@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@redhat$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox