From 527d5c04d5883c2ab8ad2460d9c07395f3d32334 Mon Sep 17 00:00:00 2001
From: Paul Jackson <pj@sgi.com>
Date: Sun, 30 Oct 2005 15:03:19 -0800
Subject: [PATCH] --- yaml --- r: 11885 b: refs/heads/master c:
 82da2c372712c772134d01317aa2517c923a74f8 h: refs/heads/master i:   11883:
 a522c7f9f981b6d402a2297bfebaf9290d3bb698 v: v3

---
 [refs]             | 2 +-
 trunk/lib/string.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 23a5f0b03ca6..26b1cdaa0b15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d57bd39eb3dbf2866b5f5cee8fbd7a29b00c56f
+refs/heads/master: 82da2c372712c772134d01317aa2517c923a74f8
diff --git a/trunk/lib/string.c b/trunk/lib/string.c
index d7a5ff9b81ea..037a48acedbb 100644
--- a/trunk/lib/string.c
+++ b/trunk/lib/string.c
@@ -488,7 +488,8 @@ EXPORT_SYMBOL(memcpy);
  */
 void *memmove(void *dest, const void *src, size_t count)
 {
-	char *tmp, *s;
+	char *tmp;
+	const char *s;
 
 	if (dest <= src) {
 		tmp = dest;