Skip to content

Commit 166ec46

Browse files
committed
asm-generic: remove extra strn{cpy_from,len}_user declarations
As these are now in asm-generic, it's no longer necessary to declare them in the architecture. Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
1 parent 98b861a commit 166ec46

File tree

3 files changed

+1
-15
lines changed

3 files changed

+1
-15
lines changed

arch/arc/include/asm/uaccess.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -667,11 +667,6 @@ extern unsigned long arc_clear_user_noinline(void __user *to,
667667
#define __clear_user(d, n) arc_clear_user_noinline(d, n)
668668
#endif
669669

670-
extern long strncpy_from_user(char *dst, const char __user *src, long count);
671-
#define strncpy_from_user(d, s, n) strncpy_from_user(d, s, n)
672-
extern long strnlen_user(const char __user *src, long n);
673-
#define strnlen_user(s, n) strnlen_user(s, n)
674-
675670
#include <asm/segment.h>
676671
#include <asm-generic/uaccess.h>
677672

arch/hexagon/include/asm/uaccess.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,6 @@ unsigned long raw_copy_to_user(void __user *to, const void *from,
5757
__kernel_size_t __clear_user_hexagon(void __user *dest, unsigned long count);
5858
#define __clear_user(a, s) __clear_user_hexagon((a), (s))
5959

60-
extern long strnlen_user(const char __user *src, long n);
61-
#define strnlen_user strnlen_user
62-
63-
extern long strncpy_from_user(char *dst, const char __user *src, long n)
64-
#define strncpy_from_user strncpy_from_user
65-
6660
#include <asm-generic/uaccess.h>
6761

6862

arch/um/include/asm/uaccess.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,13 @@
2323

2424
extern unsigned long raw_copy_from_user(void *to, const void __user *from, unsigned long n);
2525
extern unsigned long raw_copy_to_user(void __user *to, const void *from, unsigned long n);
26-
extern long strncpy_from_user(char *dst, const char __user *src, long count);
27-
extern long strnlen_user(const void __user *str, long len);
2826
extern unsigned long __clear_user(void __user *mem, unsigned long len);
2927
static inline int __access_ok(unsigned long addr, unsigned long size);
3028

3129
/* Teach asm-generic/uaccess.h that we have C functions for these. */
3230
#define __access_ok __access_ok
3331
#define __clear_user __clear_user
34-
#define strnlen_user strnlen_user
35-
#define strncpy_from_user strncpy_from_user
32+
3633
#define INLINE_COPY_FROM_USER
3734
#define INLINE_COPY_TO_USER
3835

0 commit comments

Comments
 (0)