powerpc/32: Remove FIX_SRR1
FIX_SRR1() is defined as blank. Last useful instance of FIX_SRR1()
was removed by commit 40ef8cbc6d
("powerpc: Get 64-bit configs to
compile with ARCH=powerpc") in 2005.
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Scott Wood <oss@buserror.net>
This commit is contained in:
Родитель
4ad8622dc5
Коммит
2add203169
|
@ -505,7 +505,6 @@ END_FTR_SECTION_IFCLR(CPU_FTR_601)
|
||||||
#define MTMSRD(r) mtmsrd r
|
#define MTMSRD(r) mtmsrd r
|
||||||
#define MTMSR_EERI(reg) mtmsrd reg,1
|
#define MTMSR_EERI(reg) mtmsrd reg,1
|
||||||
#else
|
#else
|
||||||
#define FIX_SRR1(ra, rb)
|
|
||||||
#ifndef CONFIG_40x
|
#ifndef CONFIG_40x
|
||||||
#define RFI rfi
|
#define RFI rfi
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -292,7 +292,6 @@ stack_ovf:
|
||||||
lis r9,StackOverflow@ha
|
lis r9,StackOverflow@ha
|
||||||
addi r9,r9,StackOverflow@l
|
addi r9,r9,StackOverflow@l
|
||||||
LOAD_MSR_KERNEL(r10,MSR_KERNEL)
|
LOAD_MSR_KERNEL(r10,MSR_KERNEL)
|
||||||
FIX_SRR1(r10,r12)
|
|
||||||
mtspr SPRN_SRR0,r9
|
mtspr SPRN_SRR0,r9
|
||||||
mtspr SPRN_SRR1,r10
|
mtspr SPRN_SRR1,r10
|
||||||
SYNC
|
SYNC
|
||||||
|
@ -417,7 +416,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_NEED_PAIRED_STWCX)
|
||||||
mtlr r4
|
mtlr r4
|
||||||
mtcr r5
|
mtcr r5
|
||||||
lwz r7,_NIP(r1)
|
lwz r7,_NIP(r1)
|
||||||
FIX_SRR1(r8, r0)
|
|
||||||
lwz r2,GPR2(r1)
|
lwz r2,GPR2(r1)
|
||||||
lwz r1,GPR1(r1)
|
lwz r1,GPR1(r1)
|
||||||
mtspr SPRN_SRR0,r7
|
mtspr SPRN_SRR0,r7
|
||||||
|
@ -951,7 +949,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_NEED_PAIRED_STWCX)
|
||||||
.globl exc_exit_restart
|
.globl exc_exit_restart
|
||||||
exc_exit_restart:
|
exc_exit_restart:
|
||||||
lwz r12,_NIP(r1)
|
lwz r12,_NIP(r1)
|
||||||
FIX_SRR1(r9,r10)
|
|
||||||
mtspr SPRN_SRR0,r12
|
mtspr SPRN_SRR0,r12
|
||||||
mtspr SPRN_SRR1,r9
|
mtspr SPRN_SRR1,r9
|
||||||
REST_4GPRS(9, r1)
|
REST_4GPRS(9, r1)
|
||||||
|
@ -1294,7 +1291,6 @@ _GLOBAL(enter_rtas)
|
||||||
1: tophys(r9,r1)
|
1: tophys(r9,r1)
|
||||||
lwz r8,INT_FRAME_SIZE+4(r9) /* get return address */
|
lwz r8,INT_FRAME_SIZE+4(r9) /* get return address */
|
||||||
lwz r9,8(r9) /* original msr value */
|
lwz r9,8(r9) /* original msr value */
|
||||||
FIX_SRR1(r9,r0)
|
|
||||||
addi r1,r1,INT_FRAME_SIZE
|
addi r1,r1,INT_FRAME_SIZE
|
||||||
li r0,0
|
li r0,0
|
||||||
mtspr SPRN_SPRG_RTAS,r0
|
mtspr SPRN_SPRG_RTAS,r0
|
||||||
|
|
|
@ -869,7 +869,6 @@ __secondary_start:
|
||||||
|
|
||||||
/* enable MMU and jump to start_secondary */
|
/* enable MMU and jump to start_secondary */
|
||||||
li r4,MSR_KERNEL
|
li r4,MSR_KERNEL
|
||||||
FIX_SRR1(r4,r5)
|
|
||||||
lis r3,start_secondary@h
|
lis r3,start_secondary@h
|
||||||
ori r3,r3,start_secondary@l
|
ori r3,r3,start_secondary@l
|
||||||
mtspr SPRN_SRR0,r3
|
mtspr SPRN_SRR0,r3
|
||||||
|
@ -977,7 +976,6 @@ start_here:
|
||||||
ori r4,r4,2f@l
|
ori r4,r4,2f@l
|
||||||
tophys(r4,r4)
|
tophys(r4,r4)
|
||||||
li r3,MSR_KERNEL & ~(MSR_IR|MSR_DR)
|
li r3,MSR_KERNEL & ~(MSR_IR|MSR_DR)
|
||||||
FIX_SRR1(r3,r5)
|
|
||||||
mtspr SPRN_SRR0,r4
|
mtspr SPRN_SRR0,r4
|
||||||
mtspr SPRN_SRR1,r3
|
mtspr SPRN_SRR1,r3
|
||||||
SYNC
|
SYNC
|
||||||
|
@ -1001,7 +999,6 @@ start_here:
|
||||||
|
|
||||||
/* Now turn on the MMU for real! */
|
/* Now turn on the MMU for real! */
|
||||||
li r4,MSR_KERNEL
|
li r4,MSR_KERNEL
|
||||||
FIX_SRR1(r4,r5)
|
|
||||||
lis r3,start_kernel@h
|
lis r3,start_kernel@h
|
||||||
ori r3,r3,start_kernel@l
|
ori r3,r3,start_kernel@l
|
||||||
mtspr SPRN_SRR0,r3
|
mtspr SPRN_SRR0,r3
|
||||||
|
|
Загрузка…
Ссылка в новой задаче