diff options
author | Christoph Lameter <clameter@sgi.com> | 2006-12-06 23:33:16 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:24 -0500 |
commit | 54e6ecb23951b195d02433a741c7f7cb0b796c78 (patch) | |
tree | c8885c49f37c8d383945b8af69d51597494ed62c /drivers/infiniband | |
parent | f7267c0c0721fd02ad3dc37c3d6dd24ccd81d4d6 (diff) |
[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/infiniband')
-rw-r--r-- | drivers/infiniband/hw/amso1100/c2_vq.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/hw/mthca/mthca_av.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/amso1100/c2_vq.c b/drivers/infiniband/hw/amso1100/c2_vq.c index 40caeb5f41b4..36620a22413c 100644 --- a/drivers/infiniband/hw/amso1100/c2_vq.c +++ b/drivers/infiniband/hw/amso1100/c2_vq.c | |||
@@ -164,7 +164,7 @@ void vq_req_put(struct c2_dev *c2dev, struct c2_vq_req *r) | |||
164 | */ | 164 | */ |
165 | void *vq_repbuf_alloc(struct c2_dev *c2dev) | 165 | void *vq_repbuf_alloc(struct c2_dev *c2dev) |
166 | { | 166 | { |
167 | return kmem_cache_alloc(c2dev->host_msg_cache, SLAB_ATOMIC); | 167 | return kmem_cache_alloc(c2dev->host_msg_cache, GFP_ATOMIC); |
168 | } | 168 | } |
169 | 169 | ||
170 | /* | 170 | /* |
diff --git a/drivers/infiniband/hw/mthca/mthca_av.c b/drivers/infiniband/hw/mthca/mthca_av.c index 57cdc1bc5f50..27caf3b0648a 100644 --- a/drivers/infiniband/hw/mthca/mthca_av.c +++ b/drivers/infiniband/hw/mthca/mthca_av.c | |||
@@ -189,7 +189,7 @@ int mthca_create_ah(struct mthca_dev *dev, | |||
189 | on_hca_fail: | 189 | on_hca_fail: |
190 | if (ah->type == MTHCA_AH_PCI_POOL) { | 190 | if (ah->type == MTHCA_AH_PCI_POOL) { |
191 | ah->av = pci_pool_alloc(dev->av_table.pool, | 191 | ah->av = pci_pool_alloc(dev->av_table.pool, |
192 | SLAB_ATOMIC, &ah->avdma); | 192 | GFP_ATOMIC, &ah->avdma); |
193 | if (!ah->av) | 193 | if (!ah->av) |
194 | return -ENOMEM; | 194 | return -ENOMEM; |
195 | 195 | ||