Commit:     a4c28ab7445f5ca60e56ffd90edb3e9fc1330b71
Parent:     66b30922c8a2c880fe61080c5bf87ae6615b9f64
Author:     Akinobu Mita <[EMAIL PROTECTED]>
AuthorDate: Tue May 29 20:46:51 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Sat Jun 2 21:01:56 2007 +1000

    [POWERPC] Fix return from pte_alloc_one() in out-of-memory case
    pte_alloc_one() is expected to return NULL if out of memory.
    But it returns virt_to_page(NULL), which is not NULL.
    This fixes it.
    Cc: Paul Mackerras <[EMAIL PROTECTED]>
    Signed-off-by: Akinobu Mita <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
 include/asm-powerpc/pgalloc-64.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/include/asm-powerpc/pgalloc-64.h b/include/asm-powerpc/pgalloc-64.h
index d9a3a8c..94d0294 100644
--- a/include/asm-powerpc/pgalloc-64.h
+++ b/include/asm-powerpc/pgalloc-64.h
@@ -90,7 +90,8 @@ static inline pte_t *pte_alloc_one_kernel(struct mm_struct 
 static inline struct page *pte_alloc_one(struct mm_struct *mm,
                                         unsigned long address)
-       return virt_to_page(pte_alloc_one_kernel(mm, address));
+       pte_t *pte = pte_alloc_one_kernel(mm, address);
+       return pte ? virt_to_page(pte) : NULL;
 static inline void pte_free_kernel(pte_t *pte)
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to