[PATCH] do_swap_page() return value fix

From: BlaisorBlade <blaisorblade_spam@yahoo.it>

An exhausted do_swap_page() should return VM_FAULT_OOM rather than -ENOMEM.

diff --git a/mm/memory.c b/mm/memory.c
index e7295619df6912b2ab4851b1e151eabb35d5d95e..876154c7969ddd6853b1de114be3e7c3fb98a010 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1251,7 +1251,7 @@ static int do_swap_page(struct mm_struct * mm,
        mark_page_accessed(page);
        pte_chain = pte_chain_alloc(GFP_KERNEL);
        if (!pte_chain) {
-               ret = -ENOMEM;
+               ret = VM_FAULT_OOM;
                goto out;
        }
        lock_page(page);