Merge branch 'akpm' (Andrew's patchbomb)

[~shefty/rdma-dev.git] / arch / arm / mm / mmap.c

diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
index 2065b603763cd3026cf5642911b2b8c783e6d021..10062ceadd1cc40ca48cc59e83f2deb6fc3e07da 100644 (file)
--- a/arch/arm/mm/mmap.c
+++ b/arch/arm/mm/mmap.c
@@ -193,7 +193,7 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
  * You really shouldn't be using read() or write() on /dev/mem.  This
  * might go away in the future.
  */
  * 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 size)
+int valid_phys_addr_range(phys_addr_t addr, size_t size)

 {
        if (addr < PHYS_OFFSET)
                return 0;
 {
        if (addr < PHYS_OFFSET)
                return 0;