Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-16 01:54:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

powerpc/dart: Remove uses of virt_to_abs() and abs_to_virt()

Browse Source 
These days they are just wrappers around __pa() and __va() respectively.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Michael Ellerman 2012-07-25 21:19:52 +00:00 committed by Benjamin Herrenschmidt
parent 7db90c0222
commit 579468a9f4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/powerpc/sysdev/dart_iommu.c
View File

@ -43,7 +43,6 @@
#include <asm/iommu.h> #include <asm/iommu.h>
#include <asm/pci-bridge.h> #include <asm/pci-bridge.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/abs_addr.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/ppc-pci.h> #include <asm/ppc-pci.h>
@ -167,7 +166,7 @@ static int dart_build(struct iommu_table *tbl, long index,
*/ */
l = npages; l = npages;
while (l--) { while (l--) {
rpn = virt_to_abs(uaddr) >> DART_PAGE_SHIFT; rpn = __pa(uaddr) >> DART_PAGE_SHIFT;
*(dp++) = DARTMAP_VALID | (rpn & DARTMAP_RPNMASK); *(dp++) = DARTMAP_VALID | (rpn & DARTMAP_RPNMASK);
@ -244,7 +243,7 @@ static int __init dart_init(struct device_node *dart_node)
panic("DART: Cannot map registers!"); panic("DART: Cannot map registers!");
/* Map in DART table */ /* Map in DART table */
dart_vbase = ioremap(virt_to_abs(dart_tablebase), dart_tablesize); dart_vbase = ioremap(__pa(dart_tablebase), dart_tablesize);
/* Fill initial table */ /* Fill initial table */
for (i = 0; i < dart_tablesize/4; i++) for (i = 0; i < dart_tablesize/4; i++)
@ -463,7 +462,7 @@ void __init alloc_dart_table(void)
* will blow up an entire large page anyway in the kernel mapping * will blow up an entire large page anyway in the kernel mapping
*/ */
dart_tablebase = (unsigned long) dart_tablebase = (unsigned long)
abs_to_virt(memblock_alloc_base(1UL<<24, 1UL<<24, 0x80000000L)); __va(memblock_alloc_base(1UL<<24, 1UL<<24, 0x80000000L));
printk(KERN_INFO "DART table allocated at: %lx\n", dart_tablebase); printk(KERN_INFO "DART table allocated at: %lx\n", dart_tablebase);
} }