Commit 8222d718 authored Aug 27, 2009 by Masami Hiramatsu Committed by Frederic Weisbecker Aug 30, 2009

kprobes/x86-64: Fix to move common_interrupt to .kprobes.text



Since nmi, debug and int3 returns to irq_return inside common_interrupt,
probing this function will cause int3-loop, so it should be marked
as __kprobes.

Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
Acked-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
LKML-Reference: <20090827172325.8246.40000.stgit@localhost.localdomain>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>

parent 8f270083

arch/x86/kernel/entry_64.S

+8 −0

Original line number	Diff line number	Diff line
		@@ -809,6 +809,10 @@ END(interrupt)
		call \func
		.endm

		/*
		* Interrupt entry/exit should be protected against kprobes
		*/
		.pushsection .kprobes.text, "ax"
		/*
		* The interrupt stubs push (~vector+0x80) onto the stack and
		* then jump to common_interrupt.
		@@ -947,6 +951,10 @@ ENTRY(retint_kernel)

		CFI_ENDPROC
		END(common_interrupt)
		/*
		* End of kprobes section
		*/
		.popsection

		/*
		* APIC interrupts.