From 47098758988436ce3dfd7b8d0f5aa3267a877c15 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 31 Aug 2006 19:39:09 +0100
Subject: [PATCH] --- yaml --- r: 36020 b: refs/heads/master c:
 d34555fb20e7abf33f86d7aa3ec0826343f38256 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6be1bba6186c..cc814d8225b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65316fd13ad9d82560edbad0a940d684380f7461
+refs/heads/master: d34555fb20e7abf33f86d7aa3ec0826343f38256
diff --git a/trunk/include/asm-mips/page.h b/trunk/include/asm-mips/page.h
index c3b872b047d7..85b258ee7090 100644
--- a/trunk/include/asm-mips/page.h
+++ b/trunk/include/asm-mips/page.h
@@ -77,15 +77,17 @@ static inline void copy_user_page(void *vto, void *vfrom, unsigned long vaddr,
   #ifdef CONFIG_CPU_MIPS32
     typedef struct { unsigned long pte_low, pte_high; } pte_t;
     #define pte_val(x)    ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
+    #define __pte(x)      ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
   #else
      typedef struct { unsigned long long pte; } pte_t;
      #define pte_val(x)	((x).pte)
+     #define __pte(x)	((pte_t) { (x) } )
   #endif
 #else
 typedef struct { unsigned long pte; } pte_t;
 #define pte_val(x)	((x).pte)
-#endif
 #define __pte(x)	((pte_t) { (x) } )
+#endif
 
 /*
  * For 3-level pagetables we defines these ourselves, for 2-level the