diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-21 18:53:19 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-21 18:53:19 +0000 |
| commit | 09cc926e9a6002790e69ed213217ef9874888624 (patch) | |
| tree | d97960db291ce620a9ee216b4d3cafd6f38ee2d3 /arch/openrisc | |
| parent | d18b9ba808322f843375c262a7df889ff406a71c (diff) | |
| parent | 252f23ea5987a4730e3399ef1ad5d78efcc786c9 (diff) | |
Merge tag 'v3.10.61' into linux-linaro-lsk
This is the 3.10.61 stable release
Diffstat (limited to 'arch/openrisc')
| -rw-r--r-- | arch/openrisc/mm/fault.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/openrisc/mm/fault.c b/arch/openrisc/mm/fault.c index e2bfafce66c5..0703acf7d327 100644 --- a/arch/openrisc/mm/fault.c +++ b/arch/openrisc/mm/fault.c @@ -86,6 +86,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long address, if (user_mode(regs)) { /* Exception was in userspace: reenable interrupts */ local_irq_enable(); + flags |= FAULT_FLAG_USER; } else { /* If exception was in a syscall, then IRQ's may have * been enabled or disabled. If they were enabled, @@ -267,10 +268,10 @@ out_of_memory: __asm__ __volatile__("l.nop 1"); up_read(&mm->mmap_sem); - printk("VM: killing process %s\n", tsk->comm); - if (user_mode(regs)) - do_exit(SIGKILL); - goto no_context; + if (!user_mode(regs)) + goto no_context; + pagefault_out_of_memory(); + return; do_sigbus: up_read(&mm->mmap_sem); |