From d3bf1ba37890137d8a06c18b4e76ee2e8a30976f Mon Sep 17 00:00:00 2001 From: Akinobu Mita Date: Tue, 29 May 2007 20:46:51 +1000 Subject: [PATCH] --- yaml --- r: 57294 b: refs/heads/master c: a4c28ab7445f5ca60e56ffd90edb3e9fc1330b71 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-powerpc/pgalloc-64.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6a0cca4e6ee2..aa7465fd212f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66b30922c8a2c880fe61080c5bf87ae6615b9f64 +refs/heads/master: a4c28ab7445f5ca60e56ffd90edb3e9fc1330b71 diff --git a/trunk/include/asm-powerpc/pgalloc-64.h b/trunk/include/asm-powerpc/pgalloc-64.h index d9a3a8ca58a1..94d0294341d6 100644 --- a/trunk/include/asm-powerpc/pgalloc-64.h +++ b/trunk/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)