Commit 8f3ba02d authored by Al Viro's avatar Al Viro

mips: get rid of unused __strnlen_user()

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 10503bf9
...@@ -1019,38 +1019,6 @@ strncpy_from_user(char *__to, const char __user *__from, long __len) ...@@ -1019,38 +1019,6 @@ strncpy_from_user(char *__to, const char __user *__from, long __len)
return res; return res;
} }
extern long __strnlen_kernel_nocheck_asm(const char __user *s, long n);
extern long __strnlen_user_nocheck_asm(const char __user *s, long n);
/* Returns: 0 if bad, string length+1 (memory size) of string if ok */
static inline long __strnlen_user(const char __user *s, long n)
{
long res;
if (eva_kernel_access()) {
__asm__ __volatile__(
"move\t$4, %1\n\t"
"move\t$5, %2\n\t"
__MODULE_JAL(__strnlen_kernel_nocheck_asm)
"move\t%0, $2"
: "=r" (res)
: "r" (s), "r" (n)
: "$2", "$4", "$5", __UA_t0, "$31");
} else {
might_fault();
__asm__ __volatile__(
"move\t$4, %1\n\t"
"move\t$5, %2\n\t"
__MODULE_JAL(__strnlen_user_nocheck_asm)
"move\t%0, $2"
: "=r" (res)
: "r" (s), "r" (n)
: "$2", "$4", "$5", __UA_t0, "$31");
}
return res;
}
extern long __strnlen_kernel_asm(const char __user *s, long n); extern long __strnlen_kernel_asm(const char __user *s, long n);
extern long __strnlen_user_asm(const char __user *s, long n); extern long __strnlen_user_asm(const char __user *s, long n);
......
...@@ -32,7 +32,6 @@ LEAF(__strnlen_\func\()_asm) ...@@ -32,7 +32,6 @@ LEAF(__strnlen_\func\()_asm)
and v0, a0 and v0, a0
bnez v0, .Lfault\@ bnez v0, .Lfault\@
FEXPORT(__strnlen_\func\()_nocheck_asm)
move v0, a0 move v0, a0
PTR_ADDU a1, a0 # stop pointer PTR_ADDU a1, a0 # stop pointer
1: 1:
...@@ -68,16 +67,12 @@ FEXPORT(__strnlen_\func\()_nocheck_asm) ...@@ -68,16 +67,12 @@ FEXPORT(__strnlen_\func\()_nocheck_asm)
#ifndef CONFIG_EVA #ifndef CONFIG_EVA
/* Set aliases */ /* Set aliases */
.global __strnlen_user_asm .global __strnlen_user_asm
.global __strnlen_user_nocheck_asm
.set __strnlen_user_asm, __strnlen_kernel_asm .set __strnlen_user_asm, __strnlen_kernel_asm
.set __strnlen_user_nocheck_asm, __strnlen_kernel_nocheck_asm
EXPORT_SYMBOL(__strnlen_user_asm) EXPORT_SYMBOL(__strnlen_user_asm)
EXPORT_SYMBOL(__strnlen_user_nocheck_asm)
#endif #endif
__BUILD_STRNLEN_ASM kernel __BUILD_STRNLEN_ASM kernel
EXPORT_SYMBOL(__strnlen_kernel_asm) EXPORT_SYMBOL(__strnlen_kernel_asm)
EXPORT_SYMBOL(__strnlen_kernel_nocheck_asm)
#ifdef CONFIG_EVA #ifdef CONFIG_EVA
...@@ -86,5 +81,4 @@ EXPORT_SYMBOL(__strnlen_kernel_nocheck_asm) ...@@ -86,5 +81,4 @@ EXPORT_SYMBOL(__strnlen_kernel_nocheck_asm)
__BUILD_STRNLEN_ASM user __BUILD_STRNLEN_ASM user
.set pop .set pop
EXPORT_SYMBOL(__strnlen_user_asm) EXPORT_SYMBOL(__strnlen_user_asm)
EXPORT_SYMBOL(__strnlen_user_nocheck_asm)
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment