From 3ed1fce00c06bc7b4b684d6b05585bc1f58e414e Mon Sep 17 00:00:00 2001
From: Yoshinori Sato <ysato@users.sourceforge.jp>
Date: Wed, 31 Dec 2014 18:44:20 +0900
Subject: [PATCH] Add arch specific strncpy_from_user

---
 arch/h8300/include/asm/uaccess.h |  6 +++---
 arch/h8300/lib/Makefile          |  2 +-
 arch/h8300/lib/strncpy.S         | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 arch/h8300/lib/strncpy.S

diff --git a/arch/h8300/include/asm/uaccess.h b/arch/h8300/include/asm/uaccess.h
index e6f9c3fe81dc..e18e48df02b4 100644
--- a/arch/h8300/include/asm/uaccess.h
+++ b/arch/h8300/include/asm/uaccess.h
@@ -20,8 +20,8 @@ static inline int __access_ok(unsigned long addr, unsigned long size)
 #define	RANGE_CHECK_OK(addr, size, lower, upper) \
 	(((addr) >= (lower)) && (((addr) + (size)) < (upper)))
 
-	extern unsigned long  _ramend;
-	return(RANGE_CHECK_OK(addr, size, 0L, (unsigned long)&_ramend));
+	extern unsigned long  memory_end;
+	return(RANGE_CHECK_OK(addr, size, 0L, memory_end));
 }
 
 /*
@@ -129,8 +129,8 @@ extern int __get_user_bad(void);
 #define copy_from_user_ret(to,from,n,retval) ({ if (copy_from_user(to,from,n)) return retval; })
 
 unsigned long clear_user(void __user *addr, unsigned long size);
-#define strncpy_from_user(s, d, n) strncpy(s, d, n)
 #define strnlen_user(s, n) strnlen(s, n)
+long strncpy_from_user(char *d, const char *s, long n);
 
 #define __clear_user	clear_user
 
diff --git a/arch/h8300/lib/Makefile b/arch/h8300/lib/Makefile
index 1577f5075b10..7ea38089d6e2 100644
--- a/arch/h8300/lib/Makefile
+++ b/arch/h8300/lib/Makefile
@@ -2,4 +2,4 @@
 # Makefile for H8/300-specific library files..
 #
 
-lib-y  = ashrdi3.o checksum.o memcpy.o memset.o abs.o romfs.o
+lib-y  = ashrdi3.o checksum.o memcpy.o memset.o abs.o strncpy.o
diff --git a/arch/h8300/lib/strncpy.S b/arch/h8300/lib/strncpy.S
new file mode 100644
index 000000000000..357ac1de6c80
--- /dev/null
+++ b/arch/h8300/lib/strncpy.S
@@ -0,0 +1,34 @@
+;;; strncpy.S
+
+#include <asm/linkage.h>
+
+	.text
+.global strncpy_from_user
+
+;;; long strncpy_from_user(void *to, void *from, size_t n)
+strncpy_from_user:
+	mov.l	er2,er2
+	bne	1f
+	sub.l	er0,er0
+	rts	
+1:
+	mov.l	er4,@-sp
+	sub.l	er3,er3
+2:	
+	mov.b	@er1+,r4l
+	mov.b	r4l,@er0
+	adds	#1,er0
+	beq	3f
+	inc.l	#1,er3
+	dec.l	#1,er2
+	bne	2b
+3:
+	dec.l	#1,er2
+4:	
+	mov.b	r4l,@er0
+	adds	#1,er0
+	dec.l	#1,er2
+	bne	4b
+	mov.l	er3,er0
+	mov.l	@sp+,er4
+	rts
-- 
2.11.0