aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirill Korotaev <dev@openvz.org>2007-02-05 16:20:00 -0800
committerTony Luck <tony.luck@intel.com>2007-02-05 16:47:02 -0800
commit71120061f271f00d8280659bf12e065ca6533d4d (patch)
tree1b144732a410c0bbefea3e9d264f815e789f5ed5
parentd00195ebc18049f067c8e389c186aa6f5d2b659f (diff)
[IA64] virt_to_page() can be called with NULL arg
It does not return NULL when arg is NULL. Signed-off-by: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> Signed-off-by: Kirill Korotaev <dev@openvz.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r--include/asm-ia64/pgalloc.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-ia64/pgalloc.h b/include/asm-ia64/pgalloc.h
index 393e04c42a2..560c287b123 100644
--- a/include/asm-ia64/pgalloc.h
+++ b/include/asm-ia64/pgalloc.h
@@ -137,7 +137,8 @@ pmd_populate_kernel(struct mm_struct *mm, pmd_t * pmd_entry, pte_t * pte)
static inline struct page *pte_alloc_one(struct mm_struct *mm,
unsigned long addr)
{
- return virt_to_page(pgtable_quicklist_alloc());
+ void *pg = pgtable_quicklist_alloc();
+ return pg ? virt_to_page(pg) : NULL;
}
static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,