projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'torvalds/master'
[firefly-linux-kernel-4.4.55.git]
/
arch
/
openrisc
/
mm
/
fault.c
diff --git
a/arch/openrisc/mm/fault.c
b/arch/openrisc/mm/fault.c
index e2bfafce66c53661064e2cf5e4b0d5d036e2c6a7..230ac20ae7944f71636e5083fdaf3f034eb10af2 100644
(file)
--- 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();
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,
} else {
/* If exception was in a syscall, then IRQ's may have
* been enabled or disabled. If they were enabled,
@@
-170,6
+171,8
@@
good_area:
if (unlikely(fault & VM_FAULT_ERROR)) {
if (fault & VM_FAULT_OOM)
goto out_of_memory;
if (unlikely(fault & VM_FAULT_ERROR)) {
if (fault & VM_FAULT_OOM)
goto out_of_memory;
+ else if (fault & VM_FAULT_SIGSEGV)
+ goto bad_area;
else if (fault & VM_FAULT_SIGBUS)
goto do_sigbus;
BUG();
else if (fault & VM_FAULT_SIGBUS)
goto do_sigbus;
BUG();
@@
-267,10
+270,10
@@
out_of_memory:
__asm__ __volatile__("l.nop 1");
up_read(&mm->mmap_sem);
__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);
do_sigbus:
up_read(&mm->mmap_sem);