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

Commit a0c6fdb9 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Russell King
Browse files

[ARM] 2946/2: split --arch_clear_user() out of lib/uaccess.S 



Patch from Nicolas Pitre

Required for future enhancement patches.

Signed-off-by: default avatarNicolas Pitre <nico@cam.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 85eb226c

arch/arm/lib/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -9,8 +9,9 @@ lib-y := backtrace.o changebit.o csumipv6.o csumpartial.o \ 
		   copy_page.o delay.o findbit.o memchr.o memcpy.o    \

		   memset.o memzero.o setbit.o strncpy_from_user.o    \

		   strnlen_user.o strchr.o strrchr.o testchangebit.o  \

		   testclearbit.o testsetbit.o uaccess.o getuser.o    \

		   putuser.o ashldi3.o ashrdi3.o lshrdi3.o muldi3.o   \

		   testclearbit.o testsetbit.o uaccess.o              \

		   getuser.o putuser.o clear_user.o                   \

		   ashldi3.o ashrdi3.o lshrdi3.o muldi3.o             \

		   ucmpdi2.o lib1funcs.o div64.o sha1.o               \

		   io-readsb.o io-writesb.o io-readsl.o io-writesl.o

arch/arm/lib/clear_user.S

0 → 100644
+52 −0
Original line number Diff line number Diff line 
/*

 *  linux/arch/arm/lib/clear_user.S

 *

 *  Copyright (C) 1995, 1996,1997,1998 Russell King

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#include <linux/linkage.h>

#include <asm/assembler.h>



		.text



/* Prototype: int __arch_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)

		stmfd	sp!, {r1, lr}

		mov	r2, #0

		cmp	r1, #4

		blt	2f

		ands	ip, r0, #3

		beq	1f

		cmp	ip, #2

USER(		strbt	r2, [r0], #1)

USER(		strlebt	r2, [r0], #1)

USER(		strltbt	r2, [r0], #1)

		rsb	ip, ip, #4

		sub	r1, r1, ip		@  7  6  5  4  3  2  1

1:		subs	r1, r1, #8		@ -1 -2 -3 -4 -5 -6 -7

USER(		strplt	r2, [r0], #4)

USER(		strplt	r2, [r0], #4)

		bpl	1b

		adds	r1, r1, #4		@  3  2  1  0 -1 -2 -3

USER(		strplt	r2, [r0], #4)

2:		tst	r1, #2			@ 1x 1x 0x 0x 1x 1x 0x

USER(		strnebt	r2, [r0], #1)

USER(		strnebt	r2, [r0], #1)

		tst	r1, #1			@ x1 x0 x1 x0 x1 x0 x1

USER(		strnebt	r2, [r0], #1)

		mov	r0, #0

		LOADREGS(fd,sp!, {r1, pc})



		.section .fixup,"ax"

		.align	0

9001:		LOADREGS(fd,sp!, {r0, pc})

		.previous

arch/arm/lib/uaccess.S

+0 −38
Original line number Diff line number Diff line
@@ -657,41 +657,3 @@ USER( ldrgtbt r3, [r1], #1) @ May fault 
		LOADREGS(fd,sp!, {r4 - r7, pc})

		.previous

/* Prototype: int __arch_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)

		stmfd	sp!, {r1, lr}

		mov	r2, #0

		cmp	r1, #4

		blt	2f

		ands	ip, r0, #3

		beq	1f

		cmp	ip, #2

USER(		strbt	r2, [r0], #1)

USER(		strlebt	r2, [r0], #1)

USER(		strltbt	r2, [r0], #1)

		rsb	ip, ip, #4

		sub	r1, r1, ip		@  7  6  5  4  3  2  1

1:		subs	r1, r1, #8		@ -1 -2 -3 -4 -5 -6 -7

USER(		strplt	r2, [r0], #4)

USER(		strplt	r2, [r0], #4)

		bpl	1b

		adds	r1, r1, #4		@  3  2  1  0 -1 -2 -3

USER(		strplt	r2, [r0], #4)

2:		tst	r1, #2			@ 1x 1x 0x 0x 1x 1x 0x

USER(		strnebt	r2, [r0], #1)

USER(		strnebt	r2, [r0], #1)

		tst	r1, #1			@ x1 x0 x1 x0 x1 x0 x1

USER(		strnebt	r2, [r0], #1)

		mov	r0, #0

		LOADREGS(fd,sp!, {r1, pc})



		.section .fixup,"ax"

		.align	0

9001:		LOADREGS(fd,sp!, {r0, pc})

		.previous