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

Commit 762db434 authored by Alexander van Heukelum's avatar Alexander van Heukelum Committed by Ingo Molnar
Browse files

i386: remove kprobes' restore_interrupts in favour of conditional_sti 



x86_64 uses a helper function conditional_sti in traps_64.c which
is equal to restore_interrupts in kprobes.h. The only user of
restore_interrupts is in traps_32.c. Introduce conditional_sti
for i386 and remove restore_interrupts.

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

arch/x86/kernel/traps_32.c

+7 −1
Original line number Diff line number Diff line
@@ -84,6 +84,12 @@ static unsigned int code_bytes = 64; 
static int ignore_nmis;

static int die_counter;



static inline void conditional_sti(struct pt_regs *regs)

{

	if (regs->flags & X86_EFLAGS_IF)

		local_irq_enable();

}



void printk_address(unsigned long address, int reliable)

{

#ifdef CONFIG_KALLSYMS
@@ -859,7 +865,7 @@ void __kprobes do_int3(struct pt_regs *regs, long error_code) 
	 * This is an interrupt gate, because kprobes wants interrupts

	 * disabled. Normal trap handlers don't.

	 */

	restore_interrupts(regs);

	conditional_sti(regs);



	do_trap(3, SIGTRAP, "int3", 1, regs, error_code, NULL);

}

include/asm-x86/kprobes.h

+0 −9
Original line number Diff line number Diff line
@@ -82,15 +82,6 @@ struct kprobe_ctlblk { 
	struct prev_kprobe prev_kprobe;

};



/* trap3/1 are intr gates for kprobes.  So, restore the status of IF,

 * if necessary, before executing the original int3/1 (trap) handler.

 */

static inline void restore_interrupts(struct pt_regs *regs)

{

	if (regs->flags & X86_EFLAGS_IF)

		local_irq_enable();

}



extern int kprobe_fault_handler(struct pt_regs *regs, int trapnr);

extern int kprobe_exceptions_notify(struct notifier_block *self,

				    unsigned long val, void *data);