Commit 903dd1ff authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

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: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200915114650.3980244-4-npiggin@gmail.com
parent 012a9a97

arch/powerpc/kernel/exceptions-64e.S

+0 −10
Original line number Diff line number Diff line
@@ -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;

arch/powerpc/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -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()

CRA Git | Maintained and supported by SUSTech CRA and CCSE