From: Akinobu Mita Date: Tue, 29 May 2007 10:46:51 +0000 (+1000) Subject: [POWERPC] Fix return from pte_alloc_one() in out-of-memory case X-Git-Tag: v2.6.22-rc4~12^2~4 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a4c28ab7445f5ca60e56ffd90edb3e9fc1330b71;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: Akinobu Mita Signed-off-by: Paul Mackerras --- diff --git a/include/asm-powerpc/pgalloc-64.h b/include/asm-powerpc/pgalloc-64.h index d9a3a8ca58a..94d0294341d 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 *mm, 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)