diff --git a/[refs] b/[refs]
index 20894b4d0d91..afe3e228dcbc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed724be65fa18833244d81b484e425fc838837fa
+refs/heads/master: a40343497e8983cdf07fde99c9081ee62b96f745
diff --git a/trunk/arch/x86/mm/ioremap_32.c b/trunk/arch/x86/mm/ioremap_32.c
index f8e6c4709cc2..18757f058bda 100644
--- a/trunk/arch/x86/mm/ioremap_32.c
+++ b/trunk/arch/x86/mm/ioremap_32.c
@@ -67,8 +67,7 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l
 				return NULL;
 	}
 
-	prot = __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY
-			| _PAGE_ACCESSED | flags);
+	prot = MAKE_GLOBAL(__PAGE_KERNEL | flags);
 
 	/*
 	 * Mappings have to be page-aligned