diff options
| author | Christoph Lameter <cl@linux-foundation.org> | 2009-12-18 16:26:21 -0600 |
|---|---|---|
| committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-12-20 09:57:00 +0200 |
| commit | 756dee75872a2a764b478e18076360b8a4ec9045 (patch) | |
| tree | c4a09707be2f926631815dec98b0e0f3f4b9ae20 /include | |
| parent | 9dfc6e68bfe6ee452efb1a4e9ca26a9007f2b864 (diff) | |
| download | blackbird-op-linux-756dee75872a2a764b478e18076360b8a4ec9045.tar.gz blackbird-op-linux-756dee75872a2a764b478e18076360b8a4ec9045.zip | |
SLUB: Get rid of dynamic DMA kmalloc cache allocation
Dynamic DMA kmalloc cache allocation is troublesome since the
new percpu allocator does not support allocations in atomic contexts.
Reserve some statically allocated kmalloc_cpu structures instead.
Signed-off-by: Christoph Lameter <cl@linux-foundation.org>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/slub_def.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h index 17ebe0f89bf3..a78fb4ac2015 100644 --- a/include/linux/slub_def.h +++ b/include/linux/slub_def.h @@ -131,11 +131,21 @@ struct kmem_cache { #define SLUB_PAGE_SHIFT (PAGE_SHIFT + 2) +#ifdef CONFIG_ZONE_DMA +#define SLUB_DMA __GFP_DMA +/* Reserve extra caches for potential DMA use */ +#define KMALLOC_CACHES (2 * SLUB_PAGE_SHIFT - 6) +#else +/* Disable DMA functionality */ +#define SLUB_DMA (__force gfp_t)0 +#define KMALLOC_CACHES SLUB_PAGE_SHIFT +#endif + /* * We keep the general caches in an array of slab caches that are used for * 2^x bytes of allocations. */ -extern struct kmem_cache kmalloc_caches[SLUB_PAGE_SHIFT]; +extern struct kmem_cache kmalloc_caches[KMALLOC_CACHES]; /* * Sorry that the following has to be that ugly but some versions of GCC @@ -203,13 +213,6 @@ static __always_inline struct kmem_cache *kmalloc_slab(size_t size) return &kmalloc_caches[index]; } -#ifdef CONFIG_ZONE_DMA -#define SLUB_DMA __GFP_DMA -#else -/* Disable DMA functionality */ -#define SLUB_DMA (__force gfp_t)0 -#endif - void *kmem_cache_alloc(struct kmem_cache *, gfp_t); void *__kmalloc(size_t size, gfp_t flags); |
