Merge branch 'akpm' (Andrew's patchbomb)

[linux-3.10.git] / arch / sh / mm / mmap.c

diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
index c71814e..6777177 100644 (file)
--- a/arch/sh/mm/mmap.c
+++ b/arch/sh/mm/mmap.c
@@ -147,7 +147,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
  * You really shouldn't be using read() or write() on /dev/mem.  This
  * might go away in the future.
  */
-int valid_phys_addr_range(unsigned long addr, size_t count)
+int valid_phys_addr_range(phys_addr_t addr, size_t count)
 {
        if (addr < __MEMORY_START)
                return 0;