diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2012-07-25 21:19:56 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-05 15:19:30 +1000 |
| commit | 3d2675238a71545372f19723f9f066e8ad831f70 (patch) | |
| tree | 08153b4de95cf14a77e2da847575541f86d271fb /arch/powerpc/kernel/dma.c | |
| parent | 67e1dbcb1f6058c309e465f212466bbbb2325a88 (diff) | |
| download | blackbird-op-linux-3d2675238a71545372f19723f9f066e8ad831f70.tar.gz blackbird-op-linux-3d2675238a71545372f19723f9f066e8ad831f70.zip | |
powerpc/kernel: Remove uses of abs_to_virt() and virt_to_abs()
These days they are just __va() and __pa() respectively.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/dma.c')
| -rw-r--r-- | arch/powerpc/kernel/dma.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c index 355b9d84b0f8..8032b97ccdcb 100644 --- a/arch/powerpc/kernel/dma.c +++ b/arch/powerpc/kernel/dma.c @@ -14,7 +14,6 @@ #include <linux/pci.h> #include <asm/vio.h> #include <asm/bug.h> -#include <asm/abs_addr.h> #include <asm/machdep.h> /* @@ -50,7 +49,7 @@ void *dma_direct_alloc_coherent(struct device *dev, size_t size, return NULL; ret = page_address(page); memset(ret, 0, size); - *dma_handle = virt_to_abs(ret) + get_dma_offset(dev); + *dma_handle = __pa(ret) + get_dma_offset(dev); return ret; #endif |
