Messages in this thread Patch in this message | | | Date | Fri, 19 Jul 2013 00:25:02 -0400 | From | Johannes Weiner <> | Subject | [patch 3/5] x86: finish fault error path with fatal signal |
| |
The x86 fault handler bails in the middle of error handling when the task has been killed. For the next patch this is a problem, because it relies on pagefault_out_of_memory() being called even when the task has been killed, to perform proper OOM state unwinding.
This is a rather minor optimization, just remove it.
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> --- arch/x86/mm/fault.c | 11 ----------- 1 file changed, 11 deletions(-)
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 1cebabe..90248c9 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -846,17 +846,6 @@ static noinline int mm_fault_error(struct pt_regs *regs, unsigned long error_code, unsigned long address, unsigned int fault) { - /* - * Pagefault was interrupted by SIGKILL. We have no reason to - * continue pagefault. - */ - if (fatal_signal_pending(current)) { - if (!(fault & VM_FAULT_RETRY)) - up_read(¤t->mm->mmap_sem); - if (!(error_code & PF_USER)) - no_context(regs, error_code, address); - return 1; - } if (!(fault & VM_FAULT_ERROR)) return 0; -- 1.8.3.2
| |