From 734a1982d12572f7fbe52ed87a4c00e2db6a0ff7 Mon Sep 17 00:00:00 2001
From: Yoann Padioleau <padator@wanadoo.fr>
Date: Wed, 17 Oct 2007 18:04:35 +0200
Subject: [PATCH] --- yaml --- r: 70969 b: refs/heads/master c:
 83e83d546cb1b6e3c566c97de97bd2397e22ab6c h: refs/heads/master i:   70967:
 6a146fd08e9fa4cdb14e09d4a979ec1043317daa v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/mm/numa_64.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 47e143b9a5f3..f546ce8f7cc8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17d1486a69657a3de1482d1bd4882c3ce1d9cf1e
+refs/heads/master: 83e83d546cb1b6e3c566c97de97bd2397e22ab6c
diff --git a/trunk/arch/x86/mm/numa_64.c b/trunk/arch/x86/mm/numa_64.c
index 6da235522269..97e8ac75568f 100644
--- a/trunk/arch/x86/mm/numa_64.c
+++ b/trunk/arch/x86/mm/numa_64.c
@@ -166,7 +166,7 @@ early_node_mem(int nodeid, unsigned long start, unsigned long end,
 		return __va(mem);
 	ptr = __alloc_bootmem_nopanic(size,
 				SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS));
-	if (ptr == 0) {
+	if (ptr == NULL) {
 		printk(KERN_ERR "Cannot find %lu bytes in node %d\n",
 			size, nodeid);
 		return NULL;