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

Commit 1b93a717 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Remove LOADREGS macro 



As for RETINSTR, LOADREGS is a left-over from the 26-bit days.
Remove it.

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

arch/arm/boot/compressed/ll_char_wr.S

+3 −3
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ Lrow4bpplp: 
	subne	r1, r1, #1

	ldrneb	r7, [r6, r1]

	bne	Lrow4bpplp

	LOADREGS(fd, sp!, {r4 - r7, pc})

	ldmfd	sp!, {r4 - r7, pc}



@

@ Smashable regs: {r0 - r3}, [r4], {r5 - r7}, (r8 - fp), [ip], (sp), {lr}, (pc)
@@ -105,7 +105,7 @@ Lrow8bpplp: 
	subne	r1, r1, #1

	ldrneb	r7, [r6, r1]

	bne	Lrow8bpplp

	LOADREGS(fd, sp!, {r4 - r7, pc})

	ldmfd	sp!, {r4 - r7, pc}



@

@ Smashable regs: {r0 - r3}, [r4], {r5, r6}, [r7], (r8 - fp), [ip], (sp), [lr], (pc)
@@ -127,7 +127,7 @@ Lrow1bpp: 
	strb	r7, [r0], r5

	mov	r7, r7, lsr #8

	strb	r7, [r0], r5

	LOADREGS(fd, sp!, {r4 - r7, pc})

	ldmfd	sp!, {r4 - r7, pc}



	.bss

ENTRY(con_charconvtable)

arch/arm/lib/backtrace.S

+4 −4
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ ENTRY(c_backtrace) 
		movne	r0, #0

		movs	frame, r0

1:		moveq	r0, #-2

		LOADREGS(eqfd, sp!, {r4 - r8, pc})

		ldmeqfd	sp!, {r4 - r8, pc}



2:		stmfd	sp!, {pc}		@ calculate offset of PC in STMIA instruction

		ldr	r0, [sp], #4
@@ -85,7 +85,7 @@ ENTRY(c_backtrace) 
		 * A zero next framepointer means we're done.

		 */

		teq	next, #0

		LOADREGS(eqfd, sp!, {r4 - r8, pc})

		ldmeqfd	sp!, {r4 - r8, pc}



		/*

		 * The next framepointer must be above the
@@ -104,7 +104,7 @@ ENTRY(c_backtrace) 
1007:		ldr	r0, =.Lbad

		mov	r1, frame

		bl	printk

		LOADREGS(fd, sp!, {r4 - r8, pc})

		ldmfd	sp!, {r4 - r8, pc}

		.ltorg

		.previous
@@ -145,7 +145,7 @@ ENTRY(c_backtrace) 
		adrne	r0, .Lcr

		blne	printk

		mov	r0, stack

		LOADREGS(fd, sp!, {instr, reg, stack, r7, r8, pc})

		ldmfd	sp!, {instr, reg, stack, r7, r8, pc}



.Lfp:		.asciz	" r%d = %08X%c"

.Lcr:		.asciz	"\n"

arch/arm/lib/clear_user.S

+2 −2
Original line number Diff line number Diff line
@@ -43,10 +43,10 @@ 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})

		ldmfd	sp!, {r1, pc}



		.section .fixup,"ax"

		.align	0

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

9001:		ldmfd	sp!, {r0, pc}

		.previous

arch/arm/lib/copy_page.S

+1 −1
Original line number Diff line number Diff line
@@ -43,4 +43,4 @@ ENTRY(copy_page) 
		bgt	1b				@	1

	PLD(	ldmeqia r1!, {r3, r4, ip, lr}	)

	PLD(	beq	2b			)

		LOADREGS(fd, sp!, {r4, pc})		@	3
 
		ldmfd	sp!, {r4, pc}			@	3

arch/arm/lib/csumipv6.S

+1 −1
Original line number Diff line number Diff line
@@ -28,5 +28,5 @@ ENTRY(__csum_ipv6_magic) 
		adcs	r0, r0, r3

		adcs	r0, r0, r2

		adcs	r0, r0, #0

		LOADREGS(fd, sp!, {pc})

		ldmfd	sp!, {pc}