From b41e212d4e5f21c756e412f80569bab401c3a916 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 19 Jul 2007 14:11:14 -0700
Subject: [PATCH] --- yaml --- r: 61772 b: refs/heads/master c:
 ff86303e3021587c49a14df1bc54fe2d393e2223 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/include/linux/user_namespace.h | 2 +-
 trunk/mm/slab.c                      | 4 ++--
 trunk/mm/slub.c                      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index c9ebd1fd3e77..6447429a92c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e436d80085133858bf2613a630365e8a0459fd58
+refs/heads/master: ff86303e3021587c49a14df1bc54fe2d393e2223
diff --git a/trunk/include/linux/user_namespace.h b/trunk/include/linux/user_namespace.h
index bb320573bb9e..1101b0ce878f 100644
--- a/trunk/include/linux/user_namespace.h
+++ b/trunk/include/linux/user_namespace.h
@@ -49,7 +49,7 @@ static inline struct user_namespace *copy_user_ns(int flags,
 	if (flags & CLONE_NEWUSER)
 		return ERR_PTR(-EINVAL);
 
-	return NULL;
+	return old_ns;
 }
 
 static inline void put_user_ns(struct user_namespace *ns)
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index 88bc6336ce3d..c3feeaab3875 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -3690,8 +3690,8 @@ static __always_inline void *__do_kmalloc(size_t size, gfp_t flags,
 	 * functions.
 	 */
 	cachep = __find_general_cachep(size, flags);
-	if (unlikely(cachep == NULL))
-		return NULL;
+	if (unlikely(ZERO_OR_NULL_PTR(cachep)))
+		return cachep;
 	return __cache_alloc(cachep, flags, caller);
 }
 
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);