diff options
| -rw-r--r-- | arch/powerpc/kernel/dma_64.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/dma_64.c b/arch/powerpc/kernel/dma_64.c index 1d1dc76606ac..7b0e754383cf 100644 --- a/arch/powerpc/kernel/dma_64.c +++ b/arch/powerpc/kernel/dma_64.c | |||
| @@ -120,14 +120,18 @@ unsigned long dma_direct_offset; | |||
| 120 | static void *dma_direct_alloc_coherent(struct device *dev, size_t size, | 120 | static void *dma_direct_alloc_coherent(struct device *dev, size_t size, |
| 121 | dma_addr_t *dma_handle, gfp_t flag) | 121 | dma_addr_t *dma_handle, gfp_t flag) |
| 122 | { | 122 | { |
| 123 | struct page *page; | ||
| 123 | void *ret; | 124 | void *ret; |
| 125 | int node = dev->archdata.numa_node; | ||
| 124 | 126 | ||
| 125 | /* TODO: Maybe use the numa node here too ? */ | 127 | /* TODO: Maybe use the numa node here too ? */ |
| 126 | ret = (void *)__get_free_pages(flag, get_order(size)); | 128 | page = alloc_pages_node(node, flag, get_order(size)); |
| 127 | if (ret != NULL) { | 129 | if (page == NULL) |
| 128 | memset(ret, 0, size); | 130 | return NULL; |
| 129 | *dma_handle = virt_to_abs(ret) | dma_direct_offset; | 131 | ret = page_address(page); |
| 130 | } | 132 | memset(ret, 0, size); |
| 133 | *dma_handle = virt_to_abs(ret) | dma_direct_offset; | ||
| 134 | |||
| 131 | return ret; | 135 | return ret; |
| 132 | } | 136 | } |
| 133 | 137 | ||
