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

Commit 5b072ba4 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[POWERPC] Exception numbers are not relevant to iSeries 



so remove them from the macros.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 7180e3e6

arch/powerpc/platforms/iseries/exception.S

+12 −12
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ iSeries_secondary_smp_loop: 


/***  ISeries-LPAR interrupt handlers ***/



	STD_EXCEPTION_ISERIES(0x200, machine_check, PACA_EXMC)

	STD_EXCEPTION_ISERIES(machine_check, PACA_EXMC)



	.globl data_access_iSeries

data_access_iSeries:
@@ -137,7 +137,7 @@ data_access_slb_iSeries: 
	ld	r12,LPPACASRR1(r12)

	b	.slb_miss_realmode



	STD_EXCEPTION_ISERIES(0x400, instruction_access, PACA_EXGEN)

	STD_EXCEPTION_ISERIES(instruction_access, PACA_EXGEN)



	.globl	instruction_access_slb_iSeries

instruction_access_slb_iSeries:
@@ -176,13 +176,13 @@ slb_miss_user_iseries: 
	b	slb_miss_user_common

#endif



	MASKABLE_EXCEPTION_ISERIES(0x500, hardware_interrupt)

	STD_EXCEPTION_ISERIES(0x600, alignment, PACA_EXGEN)

	STD_EXCEPTION_ISERIES(0x700, program_check, PACA_EXGEN)

	STD_EXCEPTION_ISERIES(0x800, fp_unavailable, PACA_EXGEN)

	MASKABLE_EXCEPTION_ISERIES(0x900, decrementer)

	STD_EXCEPTION_ISERIES(0xa00, trap_0a, PACA_EXGEN)

	STD_EXCEPTION_ISERIES(0xb00, trap_0b, PACA_EXGEN)

	MASKABLE_EXCEPTION_ISERIES(hardware_interrupt)

	STD_EXCEPTION_ISERIES(alignment, PACA_EXGEN)

	STD_EXCEPTION_ISERIES(program_check, PACA_EXGEN)

	STD_EXCEPTION_ISERIES(fp_unavailable, PACA_EXGEN)

	MASKABLE_EXCEPTION_ISERIES(decrementer)

	STD_EXCEPTION_ISERIES(trap_0a, PACA_EXGEN)

	STD_EXCEPTION_ISERIES(trap_0b, PACA_EXGEN)



	.globl	system_call_iSeries

system_call_iSeries:
@@ -191,9 +191,9 @@ system_call_iSeries: 
	EXCEPTION_PROLOG_ISERIES_1

	b	system_call_common



	STD_EXCEPTION_ISERIES( 0xd00, single_step, PACA_EXGEN)

	STD_EXCEPTION_ISERIES( 0xe00, trap_0e, PACA_EXGEN)

	STD_EXCEPTION_ISERIES( 0xf00, performance_monitor, PACA_EXGEN)

	STD_EXCEPTION_ISERIES(single_step, PACA_EXGEN)

	STD_EXCEPTION_ISERIES(trap_0e, PACA_EXGEN)

	STD_EXCEPTION_ISERIES(performance_monitor, PACA_EXGEN)



decrementer_iSeries_masked:

	/* We may not have a valid TOC pointer in here. */

arch/powerpc/platforms/iseries/exception.h

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
	ori	r10,r10,MSR_RI;						\

	mtmsrd	r10,1



#define STD_EXCEPTION_ISERIES(n, label, area)				\

#define STD_EXCEPTION_ISERIES(label, area)				\

	.globl label##_iSeries;						\

label##_iSeries:							\

	HMT_MEDIUM;							\
@@ -43,7 +43,7 @@ label##_iSeries: \ 
	EXCEPTION_PROLOG_ISERIES_1;					\

	b	label##_common



#define MASKABLE_EXCEPTION_ISERIES(n, label)				\

#define MASKABLE_EXCEPTION_ISERIES(label)				\

	.globl label##_iSeries;						\

label##_iSeries:							\

	HMT_MEDIUM;							\