From 887c10c305a4b04de3e3880132540005658e46d0 Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Wed, 12 Sep 2012 18:16:01 +0200 Subject: [PATCH] --- yaml --- r: 336530 b: refs/heads/master c: 0a5dfc31405d9b07a5b37f150815b9ad09685460 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/edac/amd64_edac.c | 2 +- trunk/drivers/edac/amd64_edac.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d6100c82ec7c..d35c1a7ef72e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb89f5a0547a56cf2406f1c3d6cd44f8fa62256d +refs/heads/master: 0a5dfc31405d9b07a5b37f150815b9ad09685460 diff --git a/trunk/drivers/edac/amd64_edac.c b/trunk/drivers/edac/amd64_edac.c index cfb7e57786d1..89cd71ea0e50 100644 --- a/trunk/drivers/edac/amd64_edac.c +++ b/trunk/drivers/edac/amd64_edac.c @@ -2094,7 +2094,7 @@ static u32 amd64_csrow_nr_pages(struct amd64_pvt *pvt, u8 dct, int csrow_nr) * number of bits to shift the DBAM register to extract the proper CSROW * field. */ - cs_mode = (dbam >> ((csrow_nr / 2) * 4)) & 0xF; + cs_mode = DBAM_DIMM(csrow_nr / 2, dbam); nr_pages = pvt->ops->dbam_to_cs(pvt, dct, cs_mode) << (20 - PAGE_SHIFT); diff --git a/trunk/drivers/edac/amd64_edac.h b/trunk/drivers/edac/amd64_edac.h index abefab4722c2..e864f407806c 100644 --- a/trunk/drivers/edac/amd64_edac.h +++ b/trunk/drivers/edac/amd64_edac.h @@ -219,7 +219,7 @@ #define DBAM1 0x180 /* Extract the DIMM 'type' on the i'th DIMM from the DBAM reg value passed */ -#define DBAM_DIMM(i, reg) ((((reg) >> (4*i))) & 0xF) +#define DBAM_DIMM(i, reg) ((((reg) >> (4*(i)))) & 0xF) #define DBAM_MAX_VALUE 11