diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-02-09 10:32:48 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-09 10:32:48 +0100 |
| commit | 4ad476e11f94fd3724c6e272d8220e99cd222b27 (patch) | |
| tree | a8684d4ecbfe1d2b2b1e29ed74de65394ad21b43 /arch/x86/mm/fault.c | |
| parent | ring_buffer: remove unused flags parameter, fix (diff) | |
| parent | Linux 2.6.29-rc4 (diff) | |
| download | linux-dev-4ad476e11f94fd3724c6e272d8220e99cd222b27.tar.xz linux-dev-4ad476e11f94fd3724c6e272d8220e99cd222b27.zip | |
Merge commit 'v2.6.29-rc4' into tracing/core
Diffstat (limited to 'arch/x86/mm/fault.c')
| -rw-r--r-- | arch/x86/mm/fault.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 90dfae511a41..c76ef1d701c9 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -603,8 +603,6 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code) si_code = SEGV_MAPERR; - if (notify_page_fault(regs)) - return; if (unlikely(kmmio_fault(regs, address))) return; @@ -634,6 +632,9 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code) if (spurious_fault(address, error_code)) return; + /* kprobes don't want to hook the spurious faults. */ + if (notify_page_fault(regs)) + return; /* * Don't take the mm semaphore here. If we fixup a prefetch * fault we could otherwise deadlock. @@ -641,6 +642,9 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code) goto bad_area_nosemaphore; } + /* kprobes don't want to hook the spurious faults. */ + if (notify_page_fault(regs)) + return; /* * It's safe to allow irq's after cr2 has been saved and the |