Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 441e143e authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

[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: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e94b1766

drivers/atm/he.c

+3 −3
Original line number Diff line number Diff line
@@ -820,7 +820,7 @@ he_init_group(struct he_dev *he_dev, int group) 
		void *cpuaddr;



#ifdef USE_RBPS_POOL 

		cpuaddr = pci_pool_alloc(he_dev->rbps_pool, GFP_KERNEL|SLAB_DMA, &dma_handle);

		cpuaddr = pci_pool_alloc(he_dev->rbps_pool, GFP_KERNEL|GFP_DMA, &dma_handle);

		if (cpuaddr == NULL)

			return -ENOMEM;

#else
@@ -884,7 +884,7 @@ he_init_group(struct he_dev *he_dev, int group) 
		void *cpuaddr;



#ifdef USE_RBPL_POOL

		cpuaddr = pci_pool_alloc(he_dev->rbpl_pool, GFP_KERNEL|SLAB_DMA, &dma_handle);

		cpuaddr = pci_pool_alloc(he_dev->rbpl_pool, GFP_KERNEL|GFP_DMA, &dma_handle);

		if (cpuaddr == NULL)

			return -ENOMEM;

#else
@@ -1724,7 +1724,7 @@ __alloc_tpd(struct he_dev *he_dev) 
	struct he_tpd *tpd;

	dma_addr_t dma_handle; 



	tpd = pci_pool_alloc(he_dev->tpd_pool, GFP_ATOMIC|SLAB_DMA, &dma_handle);

	tpd = pci_pool_alloc(he_dev->tpd_pool, GFP_ATOMIC|GFP_DMA, &dma_handle);

	if (tpd == NULL)

		return NULL;

drivers/s390/block/dasd_eckd.c

+1 −1
Original line number Diff line number Diff line
@@ -1215,7 +1215,7 @@ dasd_eckd_build_cp(struct dasd_device * device, struct request *req) 
		dst = page_address(bv->bv_page) + bv->bv_offset;

		if (dasd_page_cache) {

			char *copy = kmem_cache_alloc(dasd_page_cache,

						      SLAB_DMA | __GFP_NOWARN);

						      GFP_DMA | __GFP_NOWARN);

			if (copy && rq_data_dir(req) == WRITE)

				memcpy(copy + bv->bv_offset, dst, bv->bv_len);

			if (copy)

drivers/s390/block/dasd_fba.c

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ dasd_fba_build_cp(struct dasd_device * device, struct request *req) 
		dst = page_address(bv->bv_page) + bv->bv_offset;

		if (dasd_page_cache) {

			char *copy = kmem_cache_alloc(dasd_page_cache,

						      SLAB_DMA | __GFP_NOWARN);

						      GFP_DMA | __GFP_NOWARN);

			if (copy && rq_data_dir(req) == WRITE)

				memcpy(copy + bv->bv_offset, dst, bv->bv_len);

			if (copy)

drivers/usb/core/buffer.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ void hcd_buffer_destroy (struct usb_hcd *hcd) 
}





/* sometimes alloc/free could use kmalloc with SLAB_DMA, for

/* sometimes alloc/free could use kmalloc with GFP_DMA, for

 * better sharing and to leverage mm/slab.c intelligence.

 */

include/linux/slab.h

+0 −3
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ typedef struct kmem_cache kmem_cache_t; 
#include	<asm/page.h>		/* kmalloc_sizes.h needs PAGE_SIZE */

#include	<asm/cache.h>		/* kmalloc_sizes.h needs L1_CACHE_BYTES */



/* flags for kmem_cache_alloc() */

#define	SLAB_DMA		GFP_DMA



/* flags to pass to kmem_cache_create().

 * The first 3 are only valid when the allocator as been build

 * SLAB_DEBUG_SUPPORT.