diff options
| author | David Miller <davem@davemloft.net> | 2012-05-26 11:14:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-26 11:33:54 -0700 |
| commit | 2c66f623631709aa5f2e4c14c7e089682e7394a3 (patch) | |
| tree | 75e9c0fc8b832b0f9f2fe3ff41e3ae2c26036292 /arch/sparc/include/asm/uaccess_32.h | |
| parent | 5723aa993d83803157c22327e90cd59e3dcbe879 (diff) | |
| download | op-kernel-dev-2c66f623631709aa5f2e4c14c7e089682e7394a3.zip op-kernel-dev-2c66f623631709aa5f2e4c14c7e089682e7394a3.tar.gz | |
sparc: use the new generic strnlen_user() function
This throws away the sparc-specific functions in favor of the generic
optimized version.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/sparc/include/asm/uaccess_32.h')
| -rw-r--r-- | arch/sparc/include/asm/uaccess_32.h | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h index 59586b5..53a28dd 100644 --- a/arch/sparc/include/asm/uaccess_32.h +++ b/arch/sparc/include/asm/uaccess_32.h @@ -16,6 +16,8 @@ #ifndef __ASSEMBLY__ +#include <asm/processor.h> + #define ARCH_HAS_SORT_EXTABLE #define ARCH_HAS_SEARCH_EXTABLE @@ -304,24 +306,8 @@ static inline unsigned long clear_user(void __user *addr, unsigned long n) return n; } -extern long __strlen_user(const char __user *); -extern long __strnlen_user(const char __user *, long len); - -static inline long strlen_user(const char __user *str) -{ - if (!access_ok(VERIFY_READ, str, 0)) - return 0; - else - return __strlen_user(str); -} - -static inline long strnlen_user(const char __user *str, long len) -{ - if (!access_ok(VERIFY_READ, str, 0)) - return 0; - else - return __strnlen_user(str, len); -} +extern __must_check long strlen_user(const char __user *str); +extern __must_check long strnlen_user(const char __user *str, long n); #endif /* __ASSEMBLY__ */ |
