diff options
| author | Christoph Lameter <clameter@engr.sgi.com> | 2006-02-07 12:58:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 16:12:31 -0800 |
| commit | 0df420d8b6c718d9a5e37531c3a9a6804493e9f4 (patch) | |
| tree | 6b8edbb55eb8d5e84fb223bbcef7c54789270cde /mm/hugetlb.c | |
| parent | a2dfef6947139db9b886fce510c4d0c913beb5f0 (diff) | |
| download | lwn-0df420d8b6c718d9a5e37531c3a9a6804493e9f4.tar.gz lwn-0df420d8b6c718d9a5e37531c3a9a6804493e9f4.zip | |
[PATCH] hugetlbpage: return VM_FAULT_OOM on oom
Remove wrong and misleading comments.
Return VM_FAULT_OOM if the hugetlbpage fault handler cannot allocate a
page. do_no_page will end up doing do_exit(SIGKILL).
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm/hugetlb.c')
| -rw-r--r-- | mm/hugetlb.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 3255ca420fc8..67f29516662a 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -391,12 +391,7 @@ static int hugetlb_cow(struct mm_struct *mm, struct vm_area_struct *vma, if (!new_page) { page_cache_release(old_page); - - /* Logically this is OOM, not a SIGBUS, but an OOM - * could cause the kernel to go killing other - * processes which won't help the hugepage situation - * at all (?) */ - return VM_FAULT_SIGBUS; + return VM_FAULT_OOM; } spin_unlock(&mm->page_table_lock); @@ -444,15 +439,7 @@ retry: page = alloc_huge_page(vma, address); if (!page) { hugetlb_put_quota(mapping); - /* - * No huge pages available. So this is an OOM - * condition but we do not want to trigger the OOM - * killer, so we return VM_FAULT_SIGBUS. - * - * A program using hugepages may fault with Bus Error - * because no huge pages are available in the cpuset, per - * memory policy or because all are in use! - */ + ret = VM_FAULT_OOM; goto out; } |