summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-keystone
diff options
context:
space:
mode:
authorRussell King2016-01-11 18:15:58 +0100
committerRussell King2016-02-08 16:47:28 +0100
commit2841029393fad551b49b6de34d44bfa9ef256441 (patch)
tree8e4d1040e2a6cba7a1a09729abad19fe7c0a50c8 /arch/arm/mach-keystone
parentARM: 8499/1: irq: l2c: do not print error in case of missing l2c from (diff)
downloadkernel-qcow2-linux-2841029393fad551b49b6de34d44bfa9ef256441.tar.gz
kernel-qcow2-linux-2841029393fad551b49b6de34d44bfa9ef256441.tar.xz
kernel-qcow2-linux-2841029393fad551b49b6de34d44bfa9ef256441.zip
ARM: make virt_to_idmap() return unsigned long
Make virt_to_idmap() return an unsigned long rather than phys_addr_t. Returning phys_addr_t here makes no sense, because the definition of virt_to_idmap() is that it shall return a physical address which maps identically with the virtual address. Since virtual addresses are limited to 32-bit, identity mapped physical addresses are as well. Almost all users already had an implicit narrowing cast to unsigned long so let's make this official and part of this interface. Tested-by: Grygorii Strashko <grygorii.strashko@ti.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-keystone')
-rw-r--r--arch/arm/mach-keystone/keystone.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
index c279293f084c..d80879ce4963 100644
--- a/arch/arm/mach-keystone/keystone.c
+++ b/arch/arm/mach-keystone/keystone.c
@@ -63,7 +63,7 @@ static void __init keystone_init(void)
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
-static phys_addr_t keystone_virt_to_idmap(unsigned long x)
+static unsigned long keystone_virt_to_idmap(unsigned long x)
{
return (phys_addr_t)(x) - CONFIG_PAGE_OFFSET + KEYSTONE_LOW_PHYS_START;
}