From f735b0b6f1418004dbdb27b9733689680e0cbf03 Mon Sep 17 00:00:00 2001
From: Chris Metcalf <cmetcalf@tilera.com>
Date: Wed, 6 Jun 2012 13:11:05 -0400
Subject: [PATCH] --- yaml --- r: 311074 b: refs/heads/master c:
 8447c4d15e357a458c9051ddc84aa6c8b9c27000 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/edac/edac_mc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index aa81e13d04af..7d61ee29a267 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9bc5ddb1b76d3f7ee14c533300aa95907c6969e
+refs/heads/master: 8447c4d15e357a458c9051ddc84aa6c8b9c27000
diff --git a/trunk/drivers/edac/edac_mc.c b/trunk/drivers/edac/edac_mc.c
index 10f375032e96..de5ba86e8b89 100644
--- a/trunk/drivers/edac/edac_mc.c
+++ b/trunk/drivers/edac/edac_mc.c
@@ -164,7 +164,7 @@ void *edac_align_ptr(void **p, unsigned size, int n_elems)
 	else
 		return (char *)ptr;
 
-	r = size % align;
+	r = (unsigned long)p % align;
 
 	if (r == 0)
 		return (char *)ptr;