Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10503bf9 authored by Al Viro's avatar Al Viro
Browse files

get rid of unused __strncpy_from_user() instances 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 82985258

arch/cris/include/asm/uaccess.h

+0 −6
Original line number Diff line number Diff line
@@ -172,12 +172,6 @@ extern unsigned long __copy_user(void __user *to, const void *from, unsigned lon 
extern unsigned long __copy_user_in(void *to, const void __user *from, unsigned long n);

extern unsigned long __do_clear_user(void __user *to, unsigned long n);



static inline long

__strncpy_from_user(char *dst, const char __user *src, long count)

{

	return __do_strncpy_from_user(dst, src, count);

}



static inline long

strncpy_from_user(char *dst, const char __user *src, long count)

{

arch/m32r/include/asm/uaccess.h

+0 −2
Original line number Diff line number Diff line
@@ -482,8 +482,6 @@ raw_copy_to_user(void __user *to, const void *from, unsigned long n) 


long __must_check strncpy_from_user(char *dst, const char __user *src,

				long count);

long __must_check __strncpy_from_user(char *dst,

				const char __user *src, long count);



/**

 * __clear_user: - Zero a block of memory in user space, with less checking.

arch/m32r/kernel/m32r_ksyms.c

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ EXPORT_SYMBOL(__ioremap); 
EXPORT_SYMBOL(iounmap);



EXPORT_SYMBOL(strncpy_from_user);

EXPORT_SYMBOL(__strncpy_from_user);

EXPORT_SYMBOL(clear_user);

EXPORT_SYMBOL(__clear_user);

EXPORT_SYMBOL(strnlen_user);

arch/m32r/lib/usercopy.c

+0 −8
Original line number Diff line number Diff line
@@ -88,14 +88,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)

{

arch/microblaze/include/asm/uaccess.h

+1 −3
Original line number Diff line number Diff line
@@ -355,14 +355,12 @@ raw_copy_to_user(void __user *to, const void *from, unsigned long n) 
 */

extern int __strncpy_user(char *to, const char __user *from, int len);



#define __strncpy_from_user	__strncpy_user



static inline long

strncpy_from_user(char *dst, const char __user *src, long count)

{

	if (!access_ok(VERIFY_READ, src, 1))

		return -EFAULT;

	return __strncpy_from_user(dst, src, count);

	return __strncpy_user(dst, src, count);

}



/*