From 204e6ed16f357134e0ecedc4e30ec29dd9d084b6 Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@mcmartin.ca>
Date: Tue, 23 Jun 2009 11:51:43 -0400
Subject: [PATCH] --- yaml --- r: 154891 b: refs/heads/master c:
 20dbc9f724e02c26e30d89cf50e7ce259ab46da4 h: refs/heads/master i:   154889:
 ddeb6e3a74f184cc8f058e87ab8ed3cc5b911a67   154887:
 2f83b2b9d8a43bfcd0781a2bec2bb9531d50fdff v: v3

---
 [refs]                      | 2 +-
 trunk/arch/parisc/mm/init.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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