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

Commit 2add2031 authored by Christophe Leroy's avatar Christophe Leroy Committed by Scott Wood
Browse files

powerpc/32: Remove FIX_SRR1 



FIX_SRR1() is defined as blank. Last useful instance of FIX_SRR1()
was removed by commit 40ef8cbc ("powerpc: Get 64-bit configs to
compile with ARCH=powerpc") in 2005.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarScott Wood <oss@buserror.net>
parent 4ad8622d

arch/powerpc/include/asm/ppc_asm.h

+0 −1
Original line number Diff line number Diff line
@@ -505,7 +505,6 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601) 
#define MTMSRD(r)	mtmsrd	r

#define MTMSR_EERI(reg)	mtmsrd	reg,1

#else

#define FIX_SRR1(ra, rb)

#ifndef CONFIG_40x

#define	RFI		rfi

#else

arch/powerpc/kernel/entry_32.S

+0 −4
Original line number Diff line number Diff line
@@ -292,7 +292,6 @@ stack_ovf: 
	lis	r9,StackOverflow@ha

	addi	r9,r9,StackOverflow@l

	LOAD_MSR_KERNEL(r10,MSR_KERNEL)

	FIX_SRR1(r10,r12)

	mtspr	SPRN_SRR0,r9

	mtspr	SPRN_SRR1,r10

	SYNC
@@ -417,7 +416,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_NEED_PAIRED_STWCX) 
	mtlr	r4

	mtcr	r5

	lwz	r7,_NIP(r1)

	FIX_SRR1(r8, r0)

	lwz	r2,GPR2(r1)

	lwz	r1,GPR1(r1)

	mtspr	SPRN_SRR0,r7
@@ -951,7 +949,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_NEED_PAIRED_STWCX) 
	.globl exc_exit_restart

exc_exit_restart:

	lwz	r12,_NIP(r1)

	FIX_SRR1(r9,r10)

	mtspr	SPRN_SRR0,r12

	mtspr	SPRN_SRR1,r9

	REST_4GPRS(9, r1)
@@ -1294,7 +1291,6 @@ _GLOBAL(enter_rtas) 
1:	tophys(r9,r1)

	lwz	r8,INT_FRAME_SIZE+4(r9)	/* get return address */

	lwz	r9,8(r9)	/* original msr value */

	FIX_SRR1(r9,r0)

	addi	r1,r1,INT_FRAME_SIZE

	li	r0,0

	mtspr	SPRN_SPRG_RTAS,r0

arch/powerpc/kernel/head_32.S

+0 −3
Original line number Diff line number Diff line
@@ -869,7 +869,6 @@ __secondary_start: 


	/* enable MMU and jump to start_secondary */

	li	r4,MSR_KERNEL

	FIX_SRR1(r4,r5)

	lis	r3,start_secondary@h

	ori	r3,r3,start_secondary@l

	mtspr	SPRN_SRR0,r3
@@ -977,7 +976,6 @@ start_here: 
	ori	r4,r4,2f@l

	tophys(r4,r4)

	li	r3,MSR_KERNEL & ~(MSR_IR|MSR_DR)

	FIX_SRR1(r3,r5)

	mtspr	SPRN_SRR0,r4

	mtspr	SPRN_SRR1,r3

	SYNC
@@ -1001,7 +999,6 @@ start_here: 


/* Now turn on the MMU for real! */

	li	r4,MSR_KERNEL

	FIX_SRR1(r4,r5)

	lis	r3,start_kernel@h

	ori	r3,r3,start_kernel@l

	mtspr	SPRN_SRR0,r3