diff --git a/[refs] b/[refs] index 6a6a23fb8139..5d53f9795047 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49316cbf0a9875f102f98dc8b7c80cfa142e33cf +refs/heads/master: a887b4dada2f23b2ff2aa725e0509c92dc652597 diff --git a/trunk/arch/mips/mm/fault.c b/trunk/arch/mips/mm/fault.c index 6751ce9ede9e..f956ecbb8136 100644 --- a/trunk/arch/mips/mm/fault.c +++ b/trunk/arch/mips/mm/fault.c @@ -171,6 +171,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write, * We ran out of memory, call the OOM killer, and return the userspace * (which will retry the fault, or kill us if we got oom-killed). */ + up_read(&mm->mmap_sem); pagefault_out_of_memory(); return;