summaryrefslogtreecommitdiffstats
path: root/arch/m32r/lib/usercopy.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2017-08-10 18:05:53 +0200
committerTony Lindgren <tony@atomide.com>2017-08-10 18:05:53 +0200
commitc002c27874faaa170b535d03d7efee89ecdd9be4 (patch)
tree70d91eba77a9c374e4f0bf9eb8636acba57ca173 /arch/m32r/lib/usercopy.c
parentARM: dts: dra7: Add "max-frequency" property to MMC dt nodes (diff)
parentLinux v4.13-rc1 (diff)
downloadlinux-c002c27874faaa170b535d03d7efee89ecdd9be4.tar.xz
linux-c002c27874faaa170b535d03d7efee89ecdd9be4.zip
Merge tag 'v4.13-rc1' into omap-for-v4.14/mmc-regulator
Linux v4.13-rc1
Diffstat (limited to 'arch/m32r/lib/usercopy.c')
-rw-r--r--arch/m32r/lib/usercopy.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
index b3ef2c899f96..b723b11107c7 100644
--- a/arch/m32r/lib/usercopy.c
+++ b/arch/m32r/lib/usercopy.c
@@ -89,14 +89,6 @@ do { \
#endif /* CONFIG_ISA_DUAL_ISSUE */
long
-__strncpy_from_user(char *dst, const char __user *src, long count)
-{
- long res;
- __do_strncpy_from_user(dst, src, count, res);
- return res;
-}
-
-long
strncpy_from_user(char *dst, const char __user *src, long count)
{
long res = -EFAULT;