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

Commit 02fcb974 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Remove the __arch_* layer from uaccess.h 



Back in the days when we had armo (26-bit) and armv (32-bit) combined,
we had an additional layer to the uaccess macros to ensure correct
typing.  Since we no longer have 26-bit in this tree, we no longer
need this layer, so eliminate it.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent a39727f2

arch/arm/kernel/armksyms.c

+5 −5
Original line number Diff line number Diff line
@@ -109,11 +109,11 @@ EXPORT_SYMBOL(memchr); 
EXPORT_SYMBOL(__memzero);



	/* user mem (segment) */

EXPORT_SYMBOL(__arch_copy_from_user);

EXPORT_SYMBOL(__arch_copy_to_user);

EXPORT_SYMBOL(__arch_clear_user);

EXPORT_SYMBOL(__arch_strnlen_user);

EXPORT_SYMBOL(__arch_strncpy_from_user);

EXPORT_SYMBOL(__copy_from_user);

EXPORT_SYMBOL(__copy_to_user);

EXPORT_SYMBOL(__clear_user);

EXPORT_SYMBOL(__strnlen_user);

EXPORT_SYMBOL(__strncpy_from_user);



EXPORT_SYMBOL(__get_user_1);

EXPORT_SYMBOL(__get_user_2);

arch/arm/lib/clear_user.S

+2 −2
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@ 


		.text



/* Prototype: int __arch_clear_user(void *addr, size_t sz)

/* Prototype: int __clear_user(void *addr, size_t sz)

 * Purpose  : clear some user memory

 * Params   : addr - user memory address to clear

 *          : sz   - number of bytes to clear

 * Returns  : number of bytes NOT cleared

 */

ENTRY(__arch_clear_user)

ENTRY(__clear_user)

		stmfd	sp!, {r1, lr}

		mov	r2, #0

		cmp	r1, #4

arch/arm/lib/copy_from_user.S

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
/*

 * Prototype:

 *

 *	size_t __arch_copy_from_user(void *to, const void *from, size_t n)

 *	size_t __copy_from_user(void *to, const void *from, size_t n)

 *

 * Purpose:

 *
@@ -83,7 +83,7 @@ 


	.text



ENTRY(__arch_copy_from_user)

ENTRY(__copy_from_user)



#include "copy_template.S"

arch/arm/lib/copy_to_user.S

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
/*

 * Prototype:

 *

 *	size_t __arch_copy_to_user(void *to, const void *from, size_t n)

 *	size_t __copy_to_user(void *to, const void *from, size_t n)

 *

 * Purpose:

 *
@@ -86,7 +86,7 @@ 


	.text



ENTRY(__arch_copy_to_user)

ENTRY(__copy_to_user)



#include "copy_template.S"

arch/arm/lib/strncpy_from_user.S

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
 * returns the number of characters copied (strlen of copied string),

 *  -EFAULT on exception, or "len" if we fill the whole buffer

 */

ENTRY(__arch_strncpy_from_user)

ENTRY(__strncpy_from_user)

	mov	ip, r1

1:	subs	r2, r2, #1

USER(	ldrplbt	r3, [r1], #1)