Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 8222d718b3ad3ae49c48f69ae4b6a1128c9a92cf

Authored by Masami Hiramatsu
Committed by Frederic Weisbecker
1 parent 8f27008358
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 1 changed file with 8 additions and 0 deletions Side-by-side Diff

arch/x86/kernel/entry_64.S
Diff comments   View file @ 8222d71
... ... @@ -809,6 +809,10 @@
809 809 call \func
810 810 .endm
811 811  
  812 +/*
  813 + * Interrupt entry/exit should be protected against kprobes
  814 + */
  815 + .pushsection .kprobes.text, "ax"
812 816 /*
813 817 * The interrupt stubs push (~vector+0x80) onto the stack and
814 818 * then jump to common_interrupt.
... ... @@ -947,6 +951,10 @@
947 951  
948 952 CFI_ENDPROC
949 953 END(common_interrupt)
  954 +/*
  955 + * End of kprobes section
  956 + */
  957 + .popsection
950 958  
951 959 /*
952 960 * APIC interrupts.