diff --git a/[refs] b/[refs]
index 07d38f922ae1..c9e103de2292 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: feb166948876e2ff8f70b2da273b2a8e86957578
+refs/heads/master: 2bc7273b0e3a509fb598abfc5b9fe50158b830d2
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
index 1a83fe5339a9..89339c61f8e5 100644
--- a/trunk/mm/memory.c
+++ b/trunk/mm/memory.c
@@ -2966,7 +2966,7 @@ int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
 {
 	resource_size_t phys_addr;
 	unsigned long prot = 0;
-	void *maddr;
+	void __iomem *maddr;
 	int offset = addr & (PAGE_SIZE-1);
 
 	if (follow_phys(vma, addr, write, &prot, &phys_addr))