h8300: remove stale strncpy_from_user

This function is never called because h8300 uses the asm-generic
inline function version.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/h8300/kernel/h8300_ksyms.c b/arch/h8300/kernel/h8300_ksyms.c
index 1c6f902e82a5f81c6d3d584156d4a802715b600c..853d6e886477ff5971737b217fbee600c2491a4d 100644 (file)
--- a/arch/h8300/kernel/h8300_ksyms.c
+++ b/arch/h8300/kernel/h8300_ksyms.c
@@ -19,7 +19,6 @@ asmlinkage long __mulsi3(long, long);
 asmlinkage long __udivsi3(long, long);
 asmlinkage void *memcpy(void *, const void *, size_t);
 asmlinkage void *memset(void *, int, size_t);
-asmlinkage long strncpy_from_user(void *to, void *from, size_t n);
 
        /* gcc lib functions */
 EXPORT_SYMBOL(__ucmpdi2);
@@ -34,4 +33,3 @@ EXPORT_SYMBOL(__mulsi3);
 EXPORT_SYMBOL(__udivsi3);
 EXPORT_SYMBOL(memcpy);
 EXPORT_SYMBOL(memset);
-EXPORT_SYMBOL(strncpy_from_user);

diff --git a/arch/h8300/lib/Makefile b/arch/h8300/lib/Makefile
index 685fa837c1f76fa16924ae0db23d921ad3de97fa..5911c1fa856df2c6ce415b14585516a74ee79998 100644 (file)
--- a/arch/h8300/lib/Makefile
+++ b/arch/h8300/lib/Makefile
@@ -3,7 +3,7 @@
 # Makefile for H8/300-specific library files..
 #
 
-lib-y  = memcpy.o memset.o abs.o strncpy.o \
+lib-y  = memcpy.o memset.o abs.o \
         mulsi3.o udivsi3.o muldi3.o moddivsi3.o \
         ashldi3.o lshrdi3.o ashrdi3.o ucmpdi2.o \
         delay.o

diff --git a/arch/h8300/lib/strncpy.S b/arch/h8300/lib/strncpy.S
deleted file mode 100644 (file)
index 8b65d7c..0000000
--- a/arch/h8300/lib/strncpy.S
+++ /dev/null
@@ -1,35 +0,0 @@
-;;; SPDX-License-Identifier: GPL-2.0
-;;; 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