Kautuk Consul 1cefe28f95 um/kernel/trap.c: port OOM changes to handle_page_fault() ... Commit d065bd810b ("mm: retry page fault when blocking on disk transfer") and commit 37b23e0525 ("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>		2012-05-31 17:49:26 -07:00
..
alpha	Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-05-24 16:17:30 -07:00
arm	rtc: rename CONFIG_RTC_MXC to CONFIG_RTC_DRV_MXC	2012-05-29 16:22:33 -07:00
avr32	Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-05-24 16:17:30 -07:00
blackfin	Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-05-24 16:17:30 -07:00
c6x	Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-05-24 16:17:30 -07:00
cris	cris: select GENERIC_ATOMIC64	2012-05-29 16:22:18 -07:00
frv	Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-05-24 16:17:30 -07:00
h8300	Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-05-24 16:17:30 -07:00
hexagon	Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-05-24 16:17:30 -07:00
ia64	Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-05-24 16:17:30 -07:00
m32r	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-05-24 13:29:46 -07:00
m68k	Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-05-24 16:17:30 -07:00
microblaze	Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze	2012-05-28 09:49:56 -07:00
mips	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2012-05-28 10:32:28 -07:00
mn10300	Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-05-24 16:17:30 -07:00
openrisc	openrisc: use generic strnlen_user() function	2012-05-27 21:00:32 -07:00
parisc	Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-05-24 16:17:30 -07:00
powerpc	avoid iput() from flusher thread	2012-05-28 09:54:45 -07:00
s390	avoid iput() from flusher thread	2012-05-28 09:54:45 -07:00
score	Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-05-24 16:17:30 -07:00
sh	Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-05-24 16:17:30 -07:00
sparc	sparc: use the new generic strnlen_user() function	2012-05-26 11:33:54 -07:00
tile	Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2012-05-25 15:59:38 -07:00
um	um/kernel/trap.c: port OOM changes to handle_page_fault()	2012-05-31 17:49:26 -07:00
unicore32	Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-05-24 16:17:30 -07:00
x86	mm: pmd_read_atomic: fix 32bit PAE pmd walk vs pmd_populate SMP race condition	2012-05-29 16:22:24 -07:00
xtensa	Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2012-05-24 16:17:30 -07:00
.gitignore	…
Kconfig	Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping	2012-05-25 09:18:59 -07:00