diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/slub_def.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h index 98be113cf9..57deecc79d 100644 --- a/include/linux/slub_def.h +++ b/include/linux/slub_def.h | |||
| @@ -111,7 +111,7 @@ struct kmem_cache { | |||
| 111 | * We keep the general caches in an array of slab caches that are used for | 111 | * We keep the general caches in an array of slab caches that are used for |
| 112 | * 2^x bytes of allocations. | 112 | * 2^x bytes of allocations. |
| 113 | */ | 113 | */ |
| 114 | extern struct kmem_cache kmalloc_caches[PAGE_SHIFT]; | 114 | extern struct kmem_cache kmalloc_caches[PAGE_SHIFT + 1]; |
| 115 | 115 | ||
| 116 | /* | 116 | /* |
| 117 | * Sorry that the following has to be that ugly but some versions of GCC | 117 | * Sorry that the following has to be that ugly but some versions of GCC |
| @@ -197,7 +197,7 @@ static __always_inline void *kmalloc_large(size_t size, gfp_t flags) | |||
| 197 | static __always_inline void *kmalloc(size_t size, gfp_t flags) | 197 | static __always_inline void *kmalloc(size_t size, gfp_t flags) |
| 198 | { | 198 | { |
| 199 | if (__builtin_constant_p(size)) { | 199 | if (__builtin_constant_p(size)) { |
| 200 | if (size > PAGE_SIZE / 2) | 200 | if (size > PAGE_SIZE) |
| 201 | return kmalloc_large(size, flags); | 201 | return kmalloc_large(size, flags); |
| 202 | 202 | ||
| 203 | if (!(flags & SLUB_DMA)) { | 203 | if (!(flags & SLUB_DMA)) { |
| @@ -219,7 +219,7 @@ void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node); | |||
| 219 | static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) | 219 | static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) |
| 220 | { | 220 | { |
| 221 | if (__builtin_constant_p(size) && | 221 | if (__builtin_constant_p(size) && |
| 222 | size <= PAGE_SIZE / 2 && !(flags & SLUB_DMA)) { | 222 | size <= PAGE_SIZE && !(flags & SLUB_DMA)) { |
| 223 | struct kmem_cache *s = kmalloc_slab(size); | 223 | struct kmem_cache *s = kmalloc_slab(size); |
| 224 | 224 | ||
| 225 | if (!s) | 225 | if (!s) |
