tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] slab: remove SLAB_DMA

SLAB_DMA is an alias of GFP_DMA. This is the last one so we
remove the leftover comment too.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Christoph Lameter and committed by
Linus Torvalds 441e143e e94b1766

+8 -11
+3 -3
drivers/atm/he.c
··· 820 820 void *cpuaddr; 821 821 822 822 #ifdef USE_RBPS_POOL 823 - cpuaddr = pci_pool_alloc(he_dev->rbps_pool, GFP_KERNEL|SLAB_DMA, &dma_handle); 823 + cpuaddr = pci_pool_alloc(he_dev->rbps_pool, GFP_KERNEL|GFP_DMA, &dma_handle); 824 824 if (cpuaddr == NULL) 825 825 return -ENOMEM; 826 826 #else ··· 884 884 void *cpuaddr; 885 885 886 886 #ifdef USE_RBPL_POOL 887 - cpuaddr = pci_pool_alloc(he_dev->rbpl_pool, GFP_KERNEL|SLAB_DMA, &dma_handle); 887 + cpuaddr = pci_pool_alloc(he_dev->rbpl_pool, GFP_KERNEL|GFP_DMA, &dma_handle); 888 888 if (cpuaddr == NULL) 889 889 return -ENOMEM; 890 890 #else ··· 1724 1724 struct he_tpd *tpd; 1725 1725 dma_addr_t dma_handle; 1726 1726 1727 - tpd = pci_pool_alloc(he_dev->tpd_pool, GFP_ATOMIC|SLAB_DMA, &dma_handle); 1727 + tpd = pci_pool_alloc(he_dev->tpd_pool, GFP_ATOMIC|GFP_DMA, &dma_handle); 1728 1728 if (tpd == NULL) 1729 1729 return NULL; 1730 1730
+1 -1
drivers/s390/block/dasd_eckd.c
··· 1215 1215 dst = page_address(bv->bv_page) + bv->bv_offset; 1216 1216 if (dasd_page_cache) { 1217 1217 char *copy = kmem_cache_alloc(dasd_page_cache, 1218 - SLAB_DMA | __GFP_NOWARN); 1218 + GFP_DMA | __GFP_NOWARN); 1219 1219 if (copy && rq_data_dir(req) == WRITE) 1220 1220 memcpy(copy + bv->bv_offset, dst, bv->bv_len); 1221 1221 if (copy)
+1 -1
drivers/s390/block/dasd_fba.c
··· 308 308 dst = page_address(bv->bv_page) + bv->bv_offset; 309 309 if (dasd_page_cache) { 310 310 char *copy = kmem_cache_alloc(dasd_page_cache, 311 - SLAB_DMA | __GFP_NOWARN); 311 + GFP_DMA | __GFP_NOWARN); 312 312 if (copy && rq_data_dir(req) == WRITE) 313 313 memcpy(copy + bv->bv_offset, dst, bv->bv_len); 314 314 if (copy)
+1 -1
drivers/usb/core/buffer.c
··· 93 93 } 94 94 95 95 96 - /* sometimes alloc/free could use kmalloc with SLAB_DMA, for 96 + /* sometimes alloc/free could use kmalloc with GFP_DMA, for 97 97 * better sharing and to leverage mm/slab.c intelligence. 98 98 */ 99 99
-3
include/linux/slab.h
··· 18 18 #include <asm/page.h> /* kmalloc_sizes.h needs PAGE_SIZE */ 19 19 #include <asm/cache.h> /* kmalloc_sizes.h needs L1_CACHE_BYTES */ 20 20 21 - /* flags for kmem_cache_alloc() */ 22 - #define SLAB_DMA GFP_DMA 23 - 24 21 /* flags to pass to kmem_cache_create(). 25 22 * The first 3 are only valid when the allocator as been build 26 23 * SLAB_DEBUG_SUPPORT.
+2 -2
mm/slab.c
··· 2637 2637 2638 2638 static void kmem_flagcheck(struct kmem_cache *cachep, gfp_t flags) 2639 2639 { 2640 - if (flags & SLAB_DMA) 2640 + if (flags & GFP_DMA) 2641 2641 BUG_ON(!(cachep->gfpflags & GFP_DMA)); 2642 2642 else 2643 2643 BUG_ON(cachep->gfpflags & GFP_DMA); ··· 2721 2721 * Be lazy and only check for valid flags here, keeping it out of the 2722 2722 * critical path in kmem_cache_alloc(). 2723 2723 */ 2724 - BUG_ON(flags & ~(SLAB_DMA | GFP_LEVEL_MASK | __GFP_NO_GROW)); 2724 + BUG_ON(flags & ~(GFP_DMA | GFP_LEVEL_MASK | __GFP_NO_GROW)); 2725 2725 if (flags & __GFP_NO_GROW) 2726 2726 return 0; 2727 2727