lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'linus' into x86/mm

Browse Source 
Conflicts:
	arch/x86/mm/fault.c
This commit is contained in:
Ingo Molnar
2009-02-06 14:42:54 +01:00
parent 0973a06cde 9be260a646
commit 0464ac9ebd
1686 changed files with 30714 additions and 14611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/x86/mm/fault.c
View File

@@ -808,8 +808,6 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)
/* get the address */
address = read_cr2();
if (unlikely(notify_page_fault(regs)))
return;
if (unlikely(kmmio_fault(regs, address)))
return;
@@ -835,6 +833,9 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)
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.
@@ -843,6 +844,8 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)
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.