From bd67077e042afdc5e7dbe5f9b1e5a008a1297215 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Tue, 10 Aug 2010 20:26:35 -0300
Subject: [PATCH] --- yaml --- r: 217361 b: refs/heads/master c:
 e9144601d364d5b81f3e63949337f8507eb58dca h: refs/heads/master i:   217359:
 da51fd939e97bd77b7c4914a20daa6b72d8a8380 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/edac/edac_core.h   | 2 ++
 trunk/drivers/edac/i7core_edac.c | 6 +-----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 229f3019f4a4..20e72b433e1b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1288c18f48d9bf373dbed6b688cde36dc970b1ed
+refs/heads/master: e9144601d364d5b81f3e63949337f8507eb58dca
diff --git a/trunk/drivers/edac/edac_core.h b/trunk/drivers/edac/edac_core.h
index 69eb1c268f9f..d7ca43a828bd 100644
--- a/trunk/drivers/edac/edac_core.h
+++ b/trunk/drivers/edac/edac_core.h
@@ -42,8 +42,10 @@
 
 #if PAGE_SHIFT < 20
 #define PAGES_TO_MiB( pages )	( ( pages ) >> ( 20 - PAGE_SHIFT ) )
+#define MiB_TO_PAGES(mb)	((mb) >> (20 - PAGE_SHIFT))
 #else				/* PAGE_SHIFT > 20 */
 #define PAGES_TO_MiB( pages )	( ( pages ) << ( PAGE_SHIFT - 20 ) )
+#define MiB_TO_PAGES(mb)	((mb) >> (PAGE_SHIFT - 20))
 #endif
 
 #define edac_printk(level, prefix, fmt, arg...) \
diff --git a/trunk/drivers/edac/i7core_edac.c b/trunk/drivers/edac/i7core_edac.c
index 5d15daaec8b8..36b4e1422838 100644
--- a/trunk/drivers/edac/i7core_edac.c
+++ b/trunk/drivers/edac/i7core_edac.c
@@ -666,11 +666,7 @@ static int get_dimm_config(const struct mem_ctl_info *mci, int *csrow)
 				RANKOFFSET(dimm_dod[j]),
 				banks, ranks, rows, cols);
 
-#if PAGE_SHIFT > 20
-			npages = size >> (PAGE_SHIFT - 20);
-#else
-			npages = size << (20 - PAGE_SHIFT);
-#endif
+			npages = MiB_TO_PAGES(size);
 
 			csr = &mci->csrows[*csrow];
 			csr->first_page = last_page + 1;