diff --git a/[refs] b/[refs]
index 373c4d56e059..9af177210f6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d18d6d65efc2f5a3ff9a41528fbcb716b2e32615
+refs/heads/master: 793b24a2dd0d695c748efba7b2295e7f9fdd3139
diff --git a/trunk/arch/x86/mm/ioremap_32.c b/trunk/arch/x86/mm/ioremap_32.c
index 30855c44818d..7f7daf50efed 100644
--- a/trunk/arch/x86/mm/ioremap_32.c
+++ b/trunk/arch/x86/mm/ioremap_32.c
@@ -215,9 +215,9 @@ static int __init early_ioremap_debug_setup(char *str)
 {
 	early_ioremap_debug = 1;
 
-	return 1;
+	return 0;
 }
-__setup("early_ioremap_debug", early_ioremap_debug_setup);
+early_param("early_ioremap_debug", early_ioremap_debug_setup);
 
 static __initdata int after_paging_init;
 static __initdata unsigned long bm_pte[1024]