Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 234130
b: refs/heads/master
c: f862685
h: refs/heads/master
v: v3
  • Loading branch information
Andrey Vagin authored and Ingo Molnar committed Mar 10, 2011
1 parent db6cbe8 commit 9139dd3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a7bd1dafdcc13ec7add4aafc927eb5e3a8d597e6
refs/heads/master: f86268549f424f83b9eb0963989270e14fbfc3de
7 changes: 7 additions & 0 deletions trunk/arch/x86/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -828,6 +828,13 @@ mm_fault_error(struct pt_regs *regs, unsigned long error_code,
unsigned long address, unsigned int fault)
{
if (fault & VM_FAULT_OOM) {
/* Kernel mode? Handle exceptions or die: */
if (!(error_code & PF_USER)) {
up_read(&current->mm->mmap_sem);
no_context(regs, error_code, address);
return;
}

out_of_memory(regs, error_code, address);
} else {
if (fault & (VM_FAULT_SIGBUS|VM_FAULT_HWPOISON|
Expand Down

0 comments on commit 9139dd3

Please sign in to comment.