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

Commit 69c89b5b authored by Alexander van Heukelum's avatar Alexander van Heukelum Committed by Ingo Molnar
Browse files

traps: x86: remove trace_hardirqs_fixup from pagefault handler 



The last use of trace_hardirqs_fixup is unnecessary, because the
trap is taken with interrupt off on i386 as well as x86_64, and
the irq-tracer is notified of this from the assembly code.

trace_hardirqs_fixup and trace_hardirqs_fixup_flags are removed
from include/asm-x86/irqflags.h as they are no longer used.

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

arch/x86/mm/fault.c

+0 −5
Original line number Diff line number Diff line
@@ -592,11 +592,6 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code) 
	unsigned long flags;

#endif



	/*

	 * We can fault from pretty much anywhere, with unknown IRQ state.

	 */

	trace_hardirqs_fixup();



	tsk = current;

	mm = tsk->mm;

	prefetchw(&mm->mmap_sem);

include/asm-x86/irqflags.h

+0 −21
Original line number Diff line number Diff line
@@ -166,27 +166,6 @@ static inline int raw_irqs_disabled(void) 
	return raw_irqs_disabled_flags(flags);

}



/*

 * makes the traced hardirq state match with the machine state

 *

 * should be a rarely used function, only in places where its

 * otherwise impossible to know the irq state, like in traps.

 */

static inline void trace_hardirqs_fixup_flags(unsigned long flags)

{

	if (raw_irqs_disabled_flags(flags))

		trace_hardirqs_off();

	else

		trace_hardirqs_on();

}



static inline void trace_hardirqs_fixup(void)

{

	unsigned long flags = __raw_local_save_flags();



	trace_hardirqs_fixup_flags(flags);

}



#else



#ifdef CONFIG_X86_64