|
@@ -278,7 +278,8 @@ static void *sbus_alloc_coherent(struct device *dev, size_t len,
|
|
|
}
|
|
|
|
|
|
order = get_order(len_total);
|
|
|
- if ((va = __get_free_pages(GFP_KERNEL|__GFP_COMP, order)) == 0)
|
|
|
+ va = __get_free_pages(gfp, order);
|
|
|
+ if (va == 0)
|
|
|
goto err_nopages;
|
|
|
|
|
|
if ((res = kzalloc(sizeof(struct resource), GFP_KERNEL)) == NULL)
|
|
@@ -443,7 +444,7 @@ static void *pci32_alloc_coherent(struct device *dev, size_t len,
|
|
|
}
|
|
|
|
|
|
order = get_order(len_total);
|
|
|
- va = (void *) __get_free_pages(GFP_KERNEL, order);
|
|
|
+ va = (void *) __get_free_pages(gfp, order);
|
|
|
if (va == NULL) {
|
|
|
printk("pci_alloc_consistent: no %ld pages\n", len_total>>PAGE_SHIFT);
|
|
|
goto err_nopages;
|