diff options
Diffstat (limited to 'drivers/atm')
-rw-r--r-- | drivers/atm/he.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/atm/he.c b/drivers/atm/he.c index c7314a79da0f..7d9b4e52f0bf 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|GFP_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|GFP_DMA, &dma_handle); |
888 | if (cpuaddr == NULL) | 888 | if (cpuaddr == NULL) |
889 | return -ENOMEM; | 889 | return -ENOMEM; |
890 | #else | 890 | #else |
@@ -1724,7 +1724,7 @@ __alloc_tpd(struct he_dev *he_dev) | |||
1724 | struct he_tpd *tpd; | 1724 | struct he_tpd *tpd; |
1725 | dma_addr_t dma_handle; | 1725 | dma_addr_t dma_handle; |
1726 | 1726 | ||
1727 | tpd = pci_pool_alloc(he_dev->tpd_pool, SLAB_ATOMIC|SLAB_DMA, &dma_handle); | 1727 | tpd = pci_pool_alloc(he_dev->tpd_pool, GFP_ATOMIC|GFP_DMA, &dma_handle); |
1728 | if (tpd == NULL) | 1728 | if (tpd == NULL) |
1729 | return NULL; | 1729 | return NULL; |
1730 | 1730 | ||