commit 1d4ec7b1d6f130818f9b62dea3411d9ee2ff6ff6
author Roland Dreier <rdreier@cisco.com> Fri Jul 20 12:13:20 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Fri Jul 20 12:33:44 2007 -0700
tree 72af58d37022ee66a210a1707a392897681f2781
parent efa7e8673c78cc6de2d6c367eb6f50449c57ed90

Fix ZERO_OR_NULL_PTR(ZERO_SIZE_PTR)

The comparison with ZERO_SIZE_PTR in ZERO_OR_NULL_PTR() needs to be <=
(not just <) so that ZERO_OR_NULL_PTR(ZERO_SIZE_PTR) is 1.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
[ Duh!  - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

include/linux/slab.h

diff --git a/include/linux/slab.h b/include/linux/slab.h
index 7d0ecc1..d859354 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -40,7 +40,7 @@
  */
 #define ZERO_SIZE_PTR ((void *)16)
 
-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) < \
+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
 				(unsigned long)ZERO_SIZE_PTR)
 
 /*