|
|
|
@ -317,9 +317,8 @@ void *sbus_alloc_consistent(struct sbus_dev *sdev, long len, u32 *dma_addrp) |
|
|
|
|
if ((va = __get_free_pages(GFP_KERNEL|__GFP_COMP, order)) == 0) |
|
|
|
|
goto err_nopages; |
|
|
|
|
|
|
|
|
|
if ((res = kmalloc(sizeof(struct resource), GFP_KERNEL)) == NULL) |
|
|
|
|
if ((res = kzalloc(sizeof(struct resource), GFP_KERNEL)) == NULL) |
|
|
|
|
goto err_nomem; |
|
|
|
|
memset((char*)res, 0, sizeof(struct resource)); |
|
|
|
|
|
|
|
|
|
if (allocate_resource(&_sparc_dvma, res, len_total, |
|
|
|
|
_sparc_dvma.start, _sparc_dvma.end, PAGE_SIZE, NULL, NULL) != 0) { |
|
|
|
@ -589,12 +588,11 @@ void *pci_alloc_consistent(struct pci_dev *pdev, size_t len, dma_addr_t *pba) |
|
|
|
|
return NULL; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if ((res = kmalloc(sizeof(struct resource), GFP_KERNEL)) == NULL) { |
|
|
|
|
if ((res = kzalloc(sizeof(struct resource), GFP_KERNEL)) == NULL) { |
|
|
|
|
free_pages(va, order); |
|
|
|
|
printk("pci_alloc_consistent: no core\n"); |
|
|
|
|
return NULL; |
|
|
|
|
} |
|
|
|
|
memset((char*)res, 0, sizeof(struct resource)); |
|
|
|
|
|
|
|
|
|
if (allocate_resource(&_sparc_dvma, res, len_total, |
|
|
|
|
_sparc_dvma.start, _sparc_dvma.end, PAGE_SIZE, NULL, NULL) != 0) { |
|
|
|
|