diff --git a/[refs] b/[refs] index 21a208ba235e..c26362d53536 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: efa7e8673c78cc6de2d6c367eb6f50449c57ed90 +refs/heads/master: 1d4ec7b1d6f130818f9b62dea3411d9ee2ff6ff6 diff --git a/trunk/include/linux/slab.h b/trunk/include/linux/slab.h index 7d0ecc1659f0..d859354b9e51 100644 --- a/trunk/include/linux/slab.h +++ b/trunk/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) /*