diff options
| author | Nicholas Piggin <npiggin@gmail.com> | 2020-09-15 13:46:48 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-10-06 14:22:23 +0200 |
| commit | 903dd1ff453e458fc7608ee4df42a6df16d3d1a0 (patch) | |
| tree | ec8db15b6716fddc80d6cef2e0ca65f59a7a8d5e | |
| parent | powerpc/64e: remove PACA_IRQ_EE_EDGE (diff) | |
| download | linux-903dd1ff453e458fc7608ee4df42a6df16d3d1a0.tar.xz linux-903dd1ff453e458fc7608ee4df42a6df16d3d1a0.zip | |
powerpc/64e: remove 64s specific interrupt soft-mask code
Since the assembly soft-masking code was moved to 64e specific, there
are some 64s specific interrupt types still there. Remove them.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200915114650.3980244-4-npiggin@gmail.com
| -rw-r--r-- | arch/powerpc/kernel/exceptions-64e.S | 10 | ||||
| -rw-r--r-- | arch/powerpc/kernel/irq.c | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S index ca444ca82b8d..f579ce46eef2 100644 --- a/arch/powerpc/kernel/exceptions-64e.S +++ b/arch/powerpc/kernel/exceptions-64e.S @@ -1302,16 +1302,6 @@ fast_exception_return: addi r3,r1,STACK_FRAME_OVERHEAD; bl do_IRQ b ret_from_except -1: cmpwi cr0,r3,0xf00 - bne 1f - addi r3,r1,STACK_FRAME_OVERHEAD; - bl performance_monitor_exception - b ret_from_except -1: cmpwi cr0,r3,0xe60 - bne 1f - addi r3,r1,STACK_FRAME_OVERHEAD; - bl handle_hmi_exception - b ret_from_except 1: cmpwi cr0,r3,0x900 bne 1f addi r3,r1,STACK_FRAME_OVERHEAD; diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index 736a6b56e7d6..b725509f9073 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c @@ -113,7 +113,7 @@ static inline notrace int decrementer_check_overflow(void) #ifdef CONFIG_PPC_BOOK3E /* This is called whenever we are re-enabling interrupts - * and returns either 0 (nothing to do) or 500/900/280/a00/e80 if + * and returns either 0 (nothing to do) or 500/900/280 if * there's an EE, DEC or DBELL to generate. * * This is called in two contexts: From arch_local_irq_restore() |