aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMin-Hua Chen <orca.chen@gmail.com>2014-10-02 10:56:59 -0400
committerCatalin Marinas <catalin.marinas@arm.com>2014-10-02 12:22:41 -0400
commit097cbd8d261ccc602c963ddf823d5023be439e04 (patch)
tree7e8dee35e3d9ca15edea2148f21946f59341a4eb
parent6c34f1f5424395994c125f8c68bed395920ecc58 (diff)
arm64: Use phys_addr_t type for physical address
Change the type of physical address from unsigned long to phys_addr_t, make valid_phys_addr_range more readable. Signed-off-by: Min-Hua Chen <orca.chen@gmail.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-rw-r--r--arch/arm64/include/asm/io.h2
-rw-r--r--arch/arm64/mm/mmap.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h
index e0ecdcf6632d..f771e8bcad4a 100644
--- a/arch/arm64/include/asm/io.h
+++ b/arch/arm64/include/asm/io.h
@@ -243,7 +243,7 @@ extern void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size);
243 * (PHYS_OFFSET and PHYS_MASK taken into account). 243 * (PHYS_OFFSET and PHYS_MASK taken into account).
244 */ 244 */
245#define ARCH_HAS_VALID_PHYS_ADDR_RANGE 245#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
246extern int valid_phys_addr_range(unsigned long addr, size_t size); 246extern int valid_phys_addr_range(phys_addr_t addr, size_t size);
247extern int valid_mmap_phys_addr_range(unsigned long pfn, size_t size); 247extern int valid_mmap_phys_addr_range(unsigned long pfn, size_t size);
248 248
249extern int devmem_is_allowed(unsigned long pfn); 249extern int devmem_is_allowed(unsigned long pfn);
diff --git a/arch/arm64/mm/mmap.c b/arch/arm64/mm/mmap.c
index 8ed6cb1a900f..1d73662f00ff 100644
--- a/arch/arm64/mm/mmap.c
+++ b/arch/arm64/mm/mmap.c
@@ -102,7 +102,7 @@ EXPORT_SYMBOL_GPL(arch_pick_mmap_layout);
102 * You really shouldn't be using read() or write() on /dev/mem. This might go 102 * You really shouldn't be using read() or write() on /dev/mem. This might go
103 * away in the future. 103 * away in the future.
104 */ 104 */
105int valid_phys_addr_range(unsigned long addr, size_t size) 105int valid_phys_addr_range(phys_addr_t addr, size_t size)
106{ 106{
107 if (addr < PHYS_OFFSET) 107 if (addr < PHYS_OFFSET)
108 return 0; 108 return 0;