summaryrefslogtreecommitdiffstats
path: root/drivers/atm
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2006-12-06 20:33:16 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 08:39:24 -0800
commit54e6ecb23951b195d02433a741c7f7cb0b796c78 (patch)
treec8885c49f37c8d383945b8af69d51597494ed62c /drivers/atm
parentf7267c0c0721fd02ad3dc37c3d6dd24ccd81d4d6 (diff)
downloadop-kernel-dev-54e6ecb23951b195d02433a741c7f7cb0b796c78.zip
op-kernel-dev-54e6ecb23951b195d02433a741c7f7cb0b796c78.tar.gz
[PATCH] slab: remove SLAB_ATOMIC
SLAB_ATOMIC is an alias of GFP_ATOMIC Signed-off-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/atm')
-rw-r--r--drivers/atm/he.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index c7314a7..2a2f0fc 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -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, SLAB_ATOMIC|SLAB_DMA, &dma_handle);
+ tpd = pci_pool_alloc(he_dev->tpd_pool, GFP_ATOMIC|SLAB_DMA, &dma_handle);
if (tpd == NULL)
return NULL;
OpenPOWER on IntegriCloud