From 8a874e673f0dc52903e623c10c7ed18be04d14fa Mon Sep 17 00:00:00 2001
From: Franck Bui-Huu <fbuihuu@gmail.com>
Date: Mon, 4 Jun 2007 17:46:35 +0200
Subject: [PATCH] --- yaml --- r: 58640 b: refs/heads/master c:
 b1c65b3988c6e29ac371ab1cbbf6c4f8fb7092f8 h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/include/asm-mips/page.h | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7f17df11a5db..2a154a3f24d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41b0483ee54d89f9ad068ceae3c91cdc7594d050
+refs/heads/master: b1c65b3988c6e29ac371ab1cbbf6c4f8fb7092f8
diff --git a/trunk/include/asm-mips/page.h b/trunk/include/asm-mips/page.h
index c56c6a85908d..b92dd8c760da 100644
--- a/trunk/include/asm-mips/page.h
+++ b/trunk/include/asm-mips/page.h
@@ -35,7 +35,7 @@
 #ifndef __ASSEMBLY__
 
 #include <linux/pfn.h>
-#include <linux/io.h>
+#include <asm/io.h>
 
 /*
  * It's normally defined only for FLATMEM config but it's
@@ -143,11 +143,15 @@ typedef struct { unsigned long pgprot; } pgprot_t;
  * __pa()/__va() should be used only during mem init.
  */
 #if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64)
-#define __pa_page_offset(x)	((unsigned long)(x) < CKSEG0 ? PAGE_OFFSET : CKSEG0)
+#define __pa(x)								\
+({									\
+    unsigned long __x = (unsigned long)(x);				\
+    __x < CKSEG0 ? XPHYSADDR(__x) : CPHYSADDR(__x);			\
+})
 #else
-#define __pa_page_offset(x)	PAGE_OFFSET
+#define __pa(x)								\
+    ((unsigned long)(x) - PAGE_OFFSET + PHYS_OFFSET)
 #endif
-#define __pa(x)		((unsigned long)(x) - __pa_page_offset(x) + PHYS_OFFSET)
 #define __va(x)		((void *)((unsigned long)(x) + PAGE_OFFSET - PHYS_OFFSET))
 #define __pa_symbol(x)	__pa(RELOC_HIDE((unsigned long)(x),0))