Merge branch 'x86/uaccess' into core/percpu

[linux-2.6-omap-h63xx.git] / include / linux / slab_def.h

diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
index fcc48096ee6406be0200c19ea7d6b1a64609dda5..6ca6a7b66d75c36eb5ab30d4f5f3784a4e9ea8aa 100644 (file)
--- a/include/linux/slab_def.h
+++ b/include/linux/slab_def.h
@@ -41,12 +41,9 @@ static inline void *kmalloc(size_t size, gfp_t flags)
                        goto found; \
                else \
                        i++;
-#include "kmalloc_sizes.h"
+#include <linux/kmalloc_sizes.h>
 #undef CACHE
-               {
-                       extern void __you_cannot_kmalloc_that_much(void);
-                       __you_cannot_kmalloc_that_much();
-               }
+               return NULL;
 found:
 #ifdef CONFIG_ZONE_DMA
                if (flags & GFP_DMA)
@@ -75,12 +72,9 @@ static inline void *kmalloc_node(size_t size, gfp_t flags, int node)
                        goto found; \
                else \
                        i++;
-#include "kmalloc_sizes.h"
+#include <linux/kmalloc_sizes.h>
 #undef CACHE
-               {
-                       extern void __you_cannot_kmalloc_that_much(void);
-                       __you_cannot_kmalloc_that_much();
-               }
+               return NULL;
 found:
 #ifdef CONFIG_ZONE_DMA
                if (flags & GFP_DMA)