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;