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

Commit df295df6 authored by Russell King's avatar Russell King
Browse files

ARM: entry: instrument svc undefined exception handler with irqtrace 



Add irqtrace function calls to the undefined exception handler, so
that we get sane lockdep traces from locking problems in undefined
exception handlers.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 02fe2845

arch/arm/kernel/entry-armv.S

+10 −0
Original line number Diff line number Diff line
@@ -268,6 +268,10 @@ __und_svc: 
	svc_entry

#endif



#ifdef CONFIG_TRACE_IRQFLAGS

	bl	trace_hardirqs_off

#endif



	@

	@ call emulation code, which returns using r9 if it has emulated

	@ the instruction, or the more conventional lr if we are to treat
@@ -300,6 +304,12 @@ __und_svc: 
	@ restore SPSR and restart the instruction

	@

	ldr	r5, [sp, #S_PSR]		@ Get SVC cpsr

#ifdef CONFIG_TRACE_IRQFLAGS

	tst	r5, #PSR_I_BIT

	bleq	trace_hardirqs_on

	tst	r5, #PSR_I_BIT

	blne	trace_hardirqs_off

#endif

	svc_exit r5				@ return from exception

 UNWIND(.fnend		)

ENDPROC(__und_svc)