From 0a802fd4031bc62179f633e2e76e43bff5dfaf15 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 19 Jul 2007 13:21:34 -0700
Subject: [PATCH] --- yaml --- r: 61766 b: refs/heads/master c:
 9550b105b8646f916862aee3ab7b25020ca14159 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 f0818a2f52e6..5ed339450fdd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5c96d8a1c67f31ef48935a78da2d2076513842b
+refs/heads/master: 9550b105b8646f916862aee3ab7b25020ca14159
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 52a4f44be394..322f3a5d72c7 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -2394,7 +2394,7 @@ size_t ksize(const void *object)
 	struct page *page;
 	struct kmem_cache *s;
 
-	if (object == ZERO_SIZE_PTR)
+	if (ZERO_OR_NULL_PTR(object))
 		return 0;
 
 	page = get_object_page(object);