From 5a2ecfeaba8f1c4ff2fda06c3608d521935ae606 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 5 Sep 2009 03:27:04 -0300 Subject: [PATCH] --- yaml --- r: 200053 b: refs/heads/master c: 6c6aa3afdba2460cb668d4cb65c74dfa8eb43449 h: refs/heads/master i: 200051: 1ca90bfb3c31dc00d3924da1fe707c34b66ec842 v: v3 --- [refs] | 2 +- trunk/drivers/edac/i7core_edac.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9d313649b208..b8a26808c4b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f47429494fd50c0b7396fe3f8a26ea638b47c5ba +refs/heads/master: 6c6aa3afdba2460cb668d4cb65c74dfa8eb43449 diff --git a/trunk/drivers/edac/i7core_edac.c b/trunk/drivers/edac/i7core_edac.c index 5bc316b8e805..335d9ed02c45 100644 --- a/trunk/drivers/edac/i7core_edac.c +++ b/trunk/drivers/edac/i7core_edac.c @@ -1681,8 +1681,13 @@ static int i7core_mce_check_error(void *priv, struct mce *mce) return 0; /* 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) { + debugf0("mc%d: ignoring mce log for socket %d. " + "Another mc should get it.\n", + pvt->i7core_dev->socket, + cpu_data(mce->cpu).phys_proc_id); return 0; + } spin_lock_irqsave(&pvt->mce_lock, flags); if (pvt->mce_count < MCE_LOG_LEN) {