um/kernel/trap.c: port OOM changes to handle_page_fault()
authorKautuk Consul <consul.kautuk@gmail.com>
Thu, 31 May 2012 23:26:03 +0000 (16:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Jun 2012 00:49:26 +0000 (17:49 -0700)
commit1cefe28f95da307287a05a6a0c10213f01055e2a
tree6810a5c8f413f67d359da6243ee75c60c704d16c
parent4f1c28d241d0882f25112d494885cd6084db225b
um/kernel/trap.c: port OOM changes to handle_page_fault()

Commit d065bd810b6d ("mm: retry page fault when blocking on disk
transfer") and commit 37b23e0525d3 ("x86,mm: make pagefault killable")
introduced changes into the x86 pagefault handler for making the page
fault handler retryable as well as killable.

These changes reduce the mmap_sem hold time, which is crucial during OOM
killer invocation.

Port these changes to um.

Signed-off-by: Kautuk Consul <consul.kautuk@gmail.com>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Richard Weinberger <richard@nod.at>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/um/kernel/trap.c