From 49f6366d696b09c7ba3f3503757af4ef6e566651 Mon Sep 17 00:00:00 2001 From: Mathias Krause Date: Thu, 18 Aug 2011 09:17:00 +0200 Subject: [PATCH] --- yaml --- r: 263075 b: refs/heads/master c: 8cf2d2399ab60842f55598bc1b00fd15503b9950 h: refs/heads/master i: 263073: 645e0e87335c15eaee4881db2a3d6d4b3a8490ed 263071: b0823e7391bd40300f3dfc7867ed33e9f74aebab v: v3 --- [refs] | 2 +- trunk/drivers/edac/i7core_edac.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c277ebd4bab4..c9086532bb07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 338d0f0a6fbc82407864606f5b64b75aeb3c70f2 +refs/heads/master: 8cf2d2399ab60842f55598bc1b00fd15503b9950 diff --git a/trunk/drivers/edac/i7core_edac.c b/trunk/drivers/edac/i7core_edac.c index 04f1e7ce02b1..f6cf448d69b4 100644 --- a/trunk/drivers/edac/i7core_edac.c +++ b/trunk/drivers/edac/i7core_edac.c @@ -1670,7 +1670,7 @@ static void i7core_mce_output_error(struct mem_ctl_info *mci, char *type, *optype, *err, *msg; unsigned long error = m->status & 0x1ff0000l; u32 optypenum = (m->status >> 4) & 0x07; - u32 core_err_cnt = (m->status >> 38) && 0x7fff; + u32 core_err_cnt = (m->status >> 38) & 0x7fff; u32 dimm = (m->misc >> 16) & 0x3; u32 channel = (m->misc >> 18) & 0x3; u32 syndrome = m->misc >> 32;