summaryrefslogtreecommitdiff
path: root/arch/x86/mm
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-13 13:09:00 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-13 13:09:00 +0100
commitb233969eaa98c7b339d955fe25a58bf6bf25739a (patch)
tree96c372824bfe05cae4b2b2b57c96719d633296da /arch/x86/mm
parentd040c1614c24162adc3fe106b182596999264e26 (diff)
parent54321d947ae9d6a051b81e3eccaf2d8658aeecc6 (diff)
Merge branch 'x86/untangle2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into x86/headers
Conflicts: arch/x86/include/asm/page.h arch/x86/include/asm/pgtable.h arch/x86/mach-voyager/voyager_smp.c arch/x86/mm/fault.c
Diffstat (limited to 'arch/x86/mm')
-rw-r--r--arch/x86/mm/fault.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 94c4e7262197..29644175490f 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -851,6 +851,7 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)
return;
}
+ /* kprobes don't want to hook the spurious faults. */
if (unlikely(notify_page_fault(regs)))
return;
/*