Commit 07bb2f62 authored by Alexander van Heukelum's avatar Alexander van Heukelum Committed by Ingo Molnar
Browse files

i386: trace_hardirqs_fixup should now not be necessary: irqs are off. 



The exception handlers in entry_32.S should now all call
TRACE_IRQS_OFF before calling the C code. The calls to
trace_hardirqs_fixup should now be unnecessary. Remove them.

Signed-off-by: default avatarAlexander van Heukelum <heukelum@fastmail.fm>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a790392f

arch/x86/kernel/traps_32.c

+0 −10
Original line number Diff line number Diff line
@@ -533,7 +533,6 @@ vm86_trap: 
#define DO_ERROR(trapnr, signr, str, name)				\

void do_##name(struct pt_regs *regs, long error_code)			\

{									\

	trace_hardirqs_fixup();						\

	if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr)	\

							== NOTIFY_STOP)	\

		return;							\
@@ -576,7 +575,6 @@ void do_##name(struct pt_regs *regs, long error_code) \ 
	info.si_errno = 0;						\

	info.si_code = sicode;						\

	info.si_addr = (void __user *)siaddr;				\

	trace_hardirqs_fixup();						\

	if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr)	\

							== NOTIFY_STOP)	\

		return;							\
@@ -860,15 +858,9 @@ void restart_nmi(void) 
void __kprobes do_int3(struct pt_regs *regs, long error_code)

{

#ifdef CONFIG_KPROBES

	trace_hardirqs_fixup();



	if (notify_die(DIE_INT3, "int3", regs, error_code, 3, SIGTRAP)

			== NOTIFY_STOP)

		return;

	/*

	 * This is an interrupt gate, because kprobes wants interrupts

	 * disabled. Normal trap handlers don't.

	 */

	conditional_sti(regs);

#else

	if (notify_die(DIE_TRAP, "int3", regs, error_code, 3, SIGTRAP)
@@ -907,8 +899,6 @@ void __kprobes do_debug(struct pt_regs *regs, long error_code) 
	unsigned int condition;

	int si_code;



	trace_hardirqs_fixup();



	get_debugreg(condition, 6);



	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE