diff options
| author |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-11-11 17:25:16 +1100 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2006-12-04 20:38:59 +1100 |
| commit | c80d9133e99de1af607314107910a2a1645efb17 (patch) | |
| tree | 9243a3ce3feba1379857150548d3975918ac0640 /arch/powerpc/kernel/dma_64.c | |
| parent | [POWERPC] Add an optional offset to direct DMA on 64 bits (diff) | |
| download | linux-dev-c80d9133e99de1af607314107910a2a1645efb17.tar.xz linux-dev-c80d9133e99de1af607314107910a2a1645efb17.zip | |
[POWERPC] Make direct DMA use node local allocations
This patch makes dma_alloc_coherent() use node local allocation when
using the direct DMA ops. The node is obtained from the new device
extension. If no such extension is present, the current node is used.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/dma_64.c')
| -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; static void *dma_direct_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag) { + struct page *page; void *ret; + int node = dev->archdata.numa_node; /* TODO: Maybe use the numa node here too ? */ - ret = (void *)__get_free_pages(flag, get_order(size)); - if (ret != NULL) { - memset(ret, 0, size); - *dma_handle = virt_to_abs(ret) | dma_direct_offset; - } + page = alloc_pages_node(node, flag, get_order(size)); + if (page == NULL) + return NULL; + ret = page_address(page); + memset(ret, 0, size); + *dma_handle = virt_to_abs(ret) | dma_direct_offset; + return ret; } |