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

Commit 4ff3fccd authored by Ralf Baechle's avatar Ralf Baechle
Browse files

MIPS: Remove __strlen_user(). 



Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent e5810fa0

arch/mips/include/asm/uaccess.h

+0 −27
Original line number Diff line number Diff line
@@ -1325,33 +1325,6 @@ strncpy_from_user(char *__to, const char __user *__from, long __len) 
	return res;

}



/* Returns: 0 if bad, string length+1 (memory size) of string if ok */

static inline long __strlen_user(const char __user *s)

{

	long res;



	if (segment_eq(get_fs(), get_ds())) {

		__asm__ __volatile__(

			"move\t$4, %1\n\t"

			__MODULE_JAL(__strlen_kernel_nocheck_asm)

			"move\t%0, $2"

			: "=r" (res)

			: "r" (s)

			: "$2", "$4", __UA_t0, "$31");

	} else {

		might_fault();

		__asm__ __volatile__(

			"move\t$4, %1\n\t"

			__MODULE_JAL(__strlen_user_nocheck_asm)

			"move\t%0, $2"

			: "=r" (res)

			: "r" (s)

			: "$2", "$4", __UA_t0, "$31");

	}



	return res;

}



/*

 * strlen_user: - Get the size of a string in user space.

 * @str: The string to measure.

arch/mips/kernel/mips_ksyms.c

+0 −4
Original line number Diff line number Diff line
@@ -24,9 +24,7 @@ extern long __strncpy_from_user_nocheck_asm(char *__to, 
					    const char *__from, long __len);

extern long __strncpy_from_user_asm(char *__to, const char *__from,

				    long __len);

extern long __strlen_kernel_nocheck_asm(const char *s);

extern long __strlen_kernel_asm(const char *s);

extern long __strlen_user_nocheck_asm(const char *s);

extern long __strlen_user_asm(const char *s);

extern long __strnlen_kernel_nocheck_asm(const char *s);

extern long __strnlen_kernel_asm(const char *s);
@@ -62,9 +60,7 @@ EXPORT_SYMBOL(__strncpy_from_kernel_nocheck_asm); 
EXPORT_SYMBOL(__strncpy_from_kernel_asm);

EXPORT_SYMBOL(__strncpy_from_user_nocheck_asm);

EXPORT_SYMBOL(__strncpy_from_user_asm);

EXPORT_SYMBOL(__strlen_kernel_nocheck_asm);

EXPORT_SYMBOL(__strlen_kernel_asm);

EXPORT_SYMBOL(__strlen_user_nocheck_asm);

EXPORT_SYMBOL(__strlen_user_asm);

EXPORT_SYMBOL(__strnlen_kernel_nocheck_asm);

EXPORT_SYMBOL(__strnlen_kernel_asm);

arch/mips/lib/strlen_user.S

+0 −3
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ LEAF(__strlen_\func\()_asm) 
	and		v0, a0

	bnez		v0, .Lfault\@



FEXPORT(__strlen_\func\()_nocheck_asm)

	move		v0, a0

.ifeqs "\func", "kernel"

1:	EX(lbu, v1, (v0), .Lfault\@)
@@ -48,9 +47,7 @@ FEXPORT(__strlen_\func\()_nocheck_asm) 
#ifndef CONFIG_EVA

	/* Set aliases */

	.global __strlen_user_asm

	.global __strlen_user_nocheck_asm

	.set __strlen_user_asm, __strlen_kernel_asm

	.set __strlen_user_nocheck_asm, __strlen_kernel_nocheck_asm

#endif



__BUILD_STRLEN_ASM kernel