Merge branch 'linus' into x86/apic
Conflicts:
arch/x86/kernel/acpi/boot.c
arch/x86/mm/fault.c
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index d3eee74..2a9ea3a 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -806,8 +806,6 @@
/* get the address */
address = read_cr2();
- if (unlikely(notify_page_fault(regs)))
- return;
if (unlikely(kmmio_fault(regs, address)))
return;
@@ -837,6 +835,9 @@
if (spurious_fault(error_code, address))
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.
@@ -845,6 +846,8 @@
return;
}
+ if (unlikely(notify_page_fault(regs)))
+ return;
/*
* It's safe to allow irq's after cr2 has been saved and the
* vmalloc fault has been handled.