diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-02-21 17:33:45 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-02-21 17:33:45 +1100 |
| commit | 97d34f4ce8d3c9f280aeffbd93326aae7c1e52f3 (patch) | |
| tree | 4089de5a1bbcfa5273aa93ae1cccd859c344e063 /mm | |
| parent | d939e44b8fdcbccb9d214d81aeeae15cbb43e313 (diff) | |
Revert "mm: make __get_user_pages return -EHWPOISON for HWPOISON page optionally"
This reverts commit b1c4f2836370f5c8207d4c61e91c93bd6a4ce27a.
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/memory.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/mm/memory.c b/mm/memory.c index d31ca1e9b103..471f3aad5e64 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1576,16 +1576,9 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, if (ret & VM_FAULT_ERROR) { if (ret & VM_FAULT_OOM) return i ? i : -ENOMEM; - if (ret & (VM_FAULT_HWPOISON | - VM_FAULT_HWPOISON_LARGE)) { - if (i) - return i; - else if (gup_flags & FOLL_HWPOISON) - return -EHWPOISON; - else - return -EFAULT; - } - if (ret & VM_FAULT_SIGBUS) + if (ret & + (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE| + VM_FAULT_SIGBUS)) return i ? i : -EFAULT; BUG(); } |