From d80d02a4c53414d76e213e33163a2db2bb1715d8 Mon Sep 17 00:00:00 2001
From: David Daney <david.daney@cavium.com>
Date: Tue, 7 May 2013 17:11:16 +0000
Subject: [PATCH] --- yaml --- r: 375757 b: refs/heads/master c:
 49c426ba445f83d304a5eab3d49efa123329cf2b h: refs/heads/master i:   375755:
 51885300c4a676247c1e9e78651b6c0e28abb672 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/mips/include/asm/io.h   | 2 +-
 trunk/arch/mips/include/asm/page.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7b90792aa8dc..2be0eded56c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e84ff42500a2b909d8aaca9a6df84c0616df121f
+refs/heads/master: 49c426ba445f83d304a5eab3d49efa123329cf2b
diff --git a/trunk/arch/mips/include/asm/io.h b/trunk/arch/mips/include/asm/io.h
index 1be13727323f..b7e59853fd33 100644
--- a/trunk/arch/mips/include/asm/io.h
+++ b/trunk/arch/mips/include/asm/io.h
@@ -118,7 +118,7 @@ static inline void set_io_port_base(unsigned long base)
  */
 static inline unsigned long virt_to_phys(volatile const void *address)
 {
-	return (unsigned long)address - PAGE_OFFSET + PHYS_OFFSET;
+	return __pa(address);
 }
 
 /*
diff --git a/trunk/arch/mips/include/asm/page.h b/trunk/arch/mips/include/asm/page.h
index eab99e536b5c..ec1ca537fbc1 100644
--- a/trunk/arch/mips/include/asm/page.h
+++ b/trunk/arch/mips/include/asm/page.h
@@ -46,7 +46,6 @@
 #endif /* CONFIG_MIPS_HUGE_TLB_SUPPORT */
 
 #include <linux/pfn.h>
-#include <asm/io.h>
 
 extern void build_clear_page(void);
 extern void build_copy_page(void);
@@ -151,6 +150,7 @@ typedef struct { unsigned long pgprot; } pgprot_t;
     ((unsigned long)(x) - PAGE_OFFSET + PHYS_OFFSET)
 #endif
 #define __va(x)		((void *)((unsigned long)(x) + PAGE_OFFSET - PHYS_OFFSET))
+#include <asm/io.h>
 
 /*
  * RELOC_HIDE was originally added by 6007b903dfe5f1d13e0c711ac2894bdd4a61b1ad