From 4732996532f9dba7b99a4779fd70a45b21e878f8 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <cl@linux.com>
Date: Wed, 23 Jan 2013 21:45:47 +0000
Subject: [PATCH] --- yaml --- r: 373738 b: refs/heads/master c:
 4d7868e6475d478172581828021bd8a356726679 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 446deaa76ed3..69882772f6e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 338b2642290ef3193229ece8cfc776ac4fe8869d
+refs/heads/master: 4d7868e6475d478172581828021bd8a356726679
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 21b3f004f614..8b1b99d399cb 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -2042,7 +2042,7 @@ static void flush_all(struct kmem_cache *s)
 static inline int node_match(struct page *page, int node)
 {
 #ifdef CONFIG_NUMA
-	if (node != NUMA_NO_NODE && page_to_nid(page) != node)
+	if (!page || (node != NUMA_NO_NODE && page_to_nid(page) != node))
 		return 0;
 #endif
 	return 1;