lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Michael Ellerman
2012-07-25 21:19:56 +00:00
committed by Benjamin Herrenschmidt
parent 67e1dbcb1f
commit 3d2675238a
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/powerpc/kernel/dma.c
View File

@@ -14,7 +14,6 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <asm/vio.h> #include <asm/vio.h>
#include <asm/bug.h> #include <asm/bug.h>
#include <asm/abs_addr.h>
#include <asm/machdep.h> #include <asm/machdep.h>
/* /*
@@ -50,7 +49,7 @@ void *dma_direct_alloc_coherent(struct device *dev, size_t size,
return NULL; return NULL;
ret = page_address(page); ret = page_address(page);
memset(ret, 0, size); memset(ret, 0, size);
*dma_handle = virt_to_abs(ret) + get_dma_offset(dev); *dma_handle = __pa(ret) + get_dma_offset(dev);
return ret; return ret;
#endif #endif

7
arch/powerpc/kernel/rtas_flash.c
View File

@@ -21,7 +21,6 @@
#include <asm/delay.h> #include <asm/delay.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/rtas.h> #include <asm/rtas.h>
#include <asm/abs_addr.h>
#define MODULE_VERS "1.0" #define MODULE_VERS "1.0"
#define MODULE_NAME "rtas_flash" #define MODULE_NAME "rtas_flash"
@@ -582,7 +581,7 @@ static void rtas_flash_firmware(int reboot_type)
flist = (struct flash_block_list *)&rtas_data_buf[0]; flist = (struct flash_block_list *)&rtas_data_buf[0];
flist->num_blocks = 0; flist->num_blocks = 0;
flist->next = rtas_firmware_flash_list; flist->next = rtas_firmware_flash_list;
rtas_block_list = virt_to_abs(flist); rtas_block_list = __pa(flist);
if (rtas_block_list >= 4UL*1024*1024*1024) { if (rtas_block_list >= 4UL*1024*1024*1024) {
printk(KERN_ALERT "FLASH: kernel bug...flash list header addr above 4GB\n"); printk(KERN_ALERT "FLASH: kernel bug...flash list header addr above 4GB\n");
spin_unlock(&rtas_data_buf_lock); spin_unlock(&rtas_data_buf_lock);
@@ -596,13 +595,13 @@ static void rtas_flash_firmware(int reboot_type)
for (f = flist; f; f = next) { for (f = flist; f; f = next) {
/* Translate data addrs to absolute */ /* Translate data addrs to absolute */
for (i = 0; i < f->num_blocks; i++) { for (i = 0; i < f->num_blocks; i++) {
f->blocks[i].data = (char *)virt_to_abs(f->blocks[i].data); f->blocks[i].data = (char *)__pa(f->blocks[i].data);
image_size += f->blocks[i].length; image_size += f->blocks[i].length;
} }
next = f->next; next = f->next;
/* Don't translate NULL pointer for last entry */ /* Don't translate NULL pointer for last entry */
if (f->next) if (f->next)
f->next = (struct flash_block_list *)virt_to_abs(f->next); f->next = (struct flash_block_list *)__pa(f->next);
else else
f->next = NULL; f->next = NULL;
/* make num_blocks into the version/length field */ /* make num_blocks into the version/length field */