diff options
| author | Andi Kleen <ak@linux.intel.com> | 2010-10-22 17:40:48 +0200 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2010-10-22 17:40:48 +0200 |
| commit | 46e387bbd82d438b9131e237e6e2cb55a825da49 (patch) | |
| tree | 414948afd6b4d63c6ea8cc79ce022128bc1bf2eb /mm/memory.c | |
| parent | e9d08567ef72a2d0fb9b14dded386352d3136442 (diff) | |
| parent | 3ef8fd7f720fc4f462fcdcae2fcde6f1c0536bfe (diff) | |
| download | kernel_samsung_smdk4412-46e387bbd82d438b9131e237e6e2cb55a825da49.zip kernel_samsung_smdk4412-46e387bbd82d438b9131e237e6e2cb55a825da49.tar.gz kernel_samsung_smdk4412-46e387bbd82d438b9131e237e6e2cb55a825da49.tar.bz2 | |
Merge branch 'hwpoison-hugepages' into hwpoison
Conflicts:
mm/memory-failure.c
Diffstat (limited to 'mm/memory.c')
| -rw-r--r-- | mm/memory.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/memory.c b/mm/memory.c index 98b58fe..af82741 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1450,7 +1450,8 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, if (ret & VM_FAULT_OOM) return i ? i : -ENOMEM; if (ret & - (VM_FAULT_HWPOISON|VM_FAULT_SIGBUS)) + (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE| + VM_FAULT_SIGBUS)) return i ? i : -EFAULT; BUG(); } |