diff options
| author | Christoph Lameter <clameter@sgi.com> | 2006-12-06 23:33:17 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:24 -0500 |
| commit | e94b1766097d53e6f3ccfb36c8baa562ffeda3fc (patch) | |
| tree | 93fa0a8ab84976d4e89c50768ca8b8878d642a0d /drivers/atm | |
| parent | 54e6ecb23951b195d02433a741c7f7cb0b796c78 (diff) | |
[PATCH] slab: remove SLAB_KERNEL
SLAB_KERNEL is an alias of GFP_KERNEL.
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/atm/he.c b/drivers/atm/he.c index 2a2f0fc2288f..ec8a7a633e68 100644 --- a/drivers/atm/he.c +++ b/drivers/atm/he.c | |||
| @@ -820,7 +820,7 @@ he_init_group(struct he_dev *he_dev, int group) | |||
| 820 | void *cpuaddr; | 820 | void *cpuaddr; |
| 821 | 821 | ||
| 822 | #ifdef USE_RBPS_POOL | 822 | #ifdef USE_RBPS_POOL |
| 823 | cpuaddr = pci_pool_alloc(he_dev->rbps_pool, SLAB_KERNEL|SLAB_DMA, &dma_handle); | 823 | cpuaddr = pci_pool_alloc(he_dev->rbps_pool, GFP_KERNEL|SLAB_DMA, &dma_handle); |
| 824 | if (cpuaddr == NULL) | 824 | if (cpuaddr == NULL) |
| 825 | return -ENOMEM; | 825 | return -ENOMEM; |
| 826 | #else | 826 | #else |
| @@ -884,7 +884,7 @@ he_init_group(struct he_dev *he_dev, int group) | |||
| 884 | void *cpuaddr; | 884 | void *cpuaddr; |
| 885 | 885 | ||
| 886 | #ifdef USE_RBPL_POOL | 886 | #ifdef USE_RBPL_POOL |
| 887 | cpuaddr = pci_pool_alloc(he_dev->rbpl_pool, SLAB_KERNEL|SLAB_DMA, &dma_handle); | 887 | cpuaddr = pci_pool_alloc(he_dev->rbpl_pool, GFP_KERNEL|SLAB_DMA, &dma_handle); |
| 888 | if (cpuaddr == NULL) | 888 | if (cpuaddr == NULL) |
| 889 | return -ENOMEM; | 889 | return -ENOMEM; |
| 890 | #else | 890 | #else |