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

Commit 35425501 authored by Anton Blanchard's avatar Anton Blanchard
Browse files

powerpc: Remove dot symbol usage in exception macros 



STD_EXCEPTION_COMMON, STD_EXCEPTION_COMMON_ASYNC and
MASKABLE_EXCEPTION branch to the handler, so we can remove
the explicit dot symbol and binutils will do the right thing.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
parent a0e971ff

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

+4 −4
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ interrupt_end_book3e: 


/* External Input Interrupt */

	MASKABLE_EXCEPTION(0x500, BOOKE_INTERRUPT_EXTERNAL,

			   external_input, .do_IRQ, ACK_NONE)

			   external_input, do_IRQ, ACK_NONE)



/* Alignment */

	START_EXCEPTION(alignment);
@@ -676,11 +676,11 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) 


/* Decrementer Interrupt */

	MASKABLE_EXCEPTION(0x900, BOOKE_INTERRUPT_DECREMENTER,

			   decrementer, .timer_interrupt, ACK_DEC)

			   decrementer, timer_interrupt, ACK_DEC)



/* Fixed Interval Timer Interrupt */

	MASKABLE_EXCEPTION(0x980, BOOKE_INTERRUPT_FIT,

			   fixed_interval, .unknown_exception, ACK_FIT)

			   fixed_interval, unknown_exception, ACK_FIT)



/* Watchdog Timer Interrupt */

	START_EXCEPTION(watchdog);
@@ -855,7 +855,7 @@ kernel_dbg_exc: 


/* Doorbell interrupt */

	MASKABLE_EXCEPTION(0x280, BOOKE_INTERRUPT_DOORBELL,

			   doorbell, .doorbell_exception, ACK_NONE)

			   doorbell, doorbell_exception, ACK_NONE)



/* Doorbell critical Interrupt */

	START_EXCEPTION(doorbell_crit);

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

+23 −23
Original line number Diff line number Diff line
@@ -769,38 +769,38 @@ kvmppc_skip_Hinterrupt: 


/*** Common interrupt handlers ***/



	STD_EXCEPTION_COMMON(0x100, system_reset, .system_reset_exception)

	STD_EXCEPTION_COMMON(0x100, system_reset, system_reset_exception)



	STD_EXCEPTION_COMMON_ASYNC(0x500, hardware_interrupt, do_IRQ)

	STD_EXCEPTION_COMMON_ASYNC(0x900, decrementer, .timer_interrupt)

	STD_EXCEPTION_COMMON(0x980, hdecrementer, .hdec_interrupt)

	STD_EXCEPTION_COMMON_ASYNC(0x900, decrementer, timer_interrupt)

	STD_EXCEPTION_COMMON(0x980, hdecrementer, hdec_interrupt)

#ifdef CONFIG_PPC_DOORBELL

	STD_EXCEPTION_COMMON_ASYNC(0xa00, doorbell_super, .doorbell_exception)

	STD_EXCEPTION_COMMON_ASYNC(0xa00, doorbell_super, doorbell_exception)

#else

	STD_EXCEPTION_COMMON_ASYNC(0xa00, doorbell_super, .unknown_exception)

	STD_EXCEPTION_COMMON_ASYNC(0xa00, doorbell_super, unknown_exception)

#endif

	STD_EXCEPTION_COMMON(0xb00, trap_0b, .unknown_exception)

	STD_EXCEPTION_COMMON(0xd00, single_step, .single_step_exception)

	STD_EXCEPTION_COMMON(0xe00, trap_0e, .unknown_exception)

	STD_EXCEPTION_COMMON(0xe40, emulation_assist, .emulation_assist_interrupt)

	STD_EXCEPTION_COMMON(0xe60, hmi_exception, .unknown_exception)

	STD_EXCEPTION_COMMON(0xb00, trap_0b, unknown_exception)

	STD_EXCEPTION_COMMON(0xd00, single_step, single_step_exception)

	STD_EXCEPTION_COMMON(0xe00, trap_0e, unknown_exception)

	STD_EXCEPTION_COMMON(0xe40, emulation_assist, emulation_assist_interrupt)

	STD_EXCEPTION_COMMON(0xe60, hmi_exception, unknown_exception)

#ifdef CONFIG_PPC_DOORBELL

	STD_EXCEPTION_COMMON_ASYNC(0xe80, h_doorbell, .doorbell_exception)

	STD_EXCEPTION_COMMON_ASYNC(0xe80, h_doorbell, doorbell_exception)

#else

	STD_EXCEPTION_COMMON_ASYNC(0xe80, h_doorbell, .unknown_exception)

	STD_EXCEPTION_COMMON_ASYNC(0xe80, h_doorbell, unknown_exception)

#endif

	STD_EXCEPTION_COMMON_ASYNC(0xf00, performance_monitor, .performance_monitor_exception)

	STD_EXCEPTION_COMMON(0x1300, instruction_breakpoint, .instruction_breakpoint_exception)

	STD_EXCEPTION_COMMON(0x1502, denorm, .unknown_exception)

	STD_EXCEPTION_COMMON_ASYNC(0xf00, performance_monitor, performance_monitor_exception)

	STD_EXCEPTION_COMMON(0x1300, instruction_breakpoint, instruction_breakpoint_exception)

	STD_EXCEPTION_COMMON(0x1502, denorm, unknown_exception)

#ifdef CONFIG_ALTIVEC

	STD_EXCEPTION_COMMON(0x1700, altivec_assist, .altivec_assist_exception)

	STD_EXCEPTION_COMMON(0x1700, altivec_assist, altivec_assist_exception)

#else

	STD_EXCEPTION_COMMON(0x1700, altivec_assist, .unknown_exception)

	STD_EXCEPTION_COMMON(0x1700, altivec_assist, unknown_exception)

#endif

#ifdef CONFIG_CBE_RAS

	STD_EXCEPTION_COMMON(0x1200, cbe_system_error, .cbe_system_error_exception)

	STD_EXCEPTION_COMMON(0x1600, cbe_maintenance, .cbe_maintenance_exception)

	STD_EXCEPTION_COMMON(0x1800, cbe_thermal, .cbe_thermal_exception)

	STD_EXCEPTION_COMMON(0x1200, cbe_system_error, cbe_system_error_exception)

	STD_EXCEPTION_COMMON(0x1600, cbe_maintenance, cbe_maintenance_exception)

	STD_EXCEPTION_COMMON(0x1800, cbe_thermal, cbe_thermal_exception)

#endif /* CONFIG_CBE_RAS */



	/*
@@ -1073,7 +1073,7 @@ instruction_access_common: 
	li	r5,0x400

	b	do_hash_page		/* Try to handle as hpte fault */



	STD_EXCEPTION_COMMON(0xe20, h_instr_storage, .unknown_exception)

	STD_EXCEPTION_COMMON(0xe20, h_instr_storage, unknown_exception)



/*

 * Here is the common SLB miss user that is used when going to virtual
@@ -1290,8 +1290,8 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX) 
	bl	vsx_unavailable_exception

	b	ret_from_except



	STD_EXCEPTION_COMMON(0xf60, facility_unavailable, .facility_unavailable_exception)

	STD_EXCEPTION_COMMON(0xf80, hv_facility_unavailable, .facility_unavailable_exception)

	STD_EXCEPTION_COMMON(0xf60, facility_unavailable, facility_unavailable_exception)

	STD_EXCEPTION_COMMON(0xf80, hv_facility_unavailable, facility_unavailable_exception)



	.align	7

	.globl	__end_handlers