diff --git a/[refs] b/[refs]
index e0ad2fdb7c82..2d7ac1b44a8d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3301ab4fb64cf84321d35a8e94f68c94c816dc1
+refs/heads/master: 20dbc9f724e02c26e30d89cf50e7ce259ab46da4
diff --git a/trunk/arch/parisc/mm/init.c b/trunk/arch/parisc/mm/init.c
index 6c5ea964647c..b0831d9e35cb 100644
--- a/trunk/arch/parisc/mm/init.c
+++ b/trunk/arch/parisc/mm/init.c
@@ -378,7 +378,7 @@ void free_initmem(void)
 	/* Attempt to catch anyone trying to execute code here
 	 * by filling the page with BRK insns.
 	 */
-	memset(init_begin, 0x00, init_end - init_begin);
+	memset((void *)init_begin, 0x00, init_end - init_begin);
 	flush_icache_range(init_begin, init_end);
 #endif