---

yaml --- r: 375757 b: refs/heads/master c: 49c426b h: refs/heads/master i: 375755: 5188530 v: v3
git-mirror · May 17, 2013 · d80d02a · d80d02a
1 parent 06f07e5
commit d80d02a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -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);
     }
     /*
@@ Expand Down @@