Merge branch 'linux-2.6' into for-2.6.24

3 files changed, 7 insertions, 4 deletions

diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
index 76903c727647..f60b3dc0fc62 100644
--- a/arch/mips/mm/dma-default.c
+++ b/arch/mips/mm/dma-default.c
@@ -35,7 +35,7 @@ static inline unsigned long dma_addr_to_virt(dma_addr_t dma_addr)
 static inline int cpu_is_noncoherent_r10000(struct device *dev)
 {
         return !plat_device_is_coherent(dev) &&
-               (current_cpu_data.cputype == CPU_R10000 &&
+               (current_cpu_data.cputype == CPU_R10000 ||
                current_cpu_data.cputype == CPU_R12000);
 }
 
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 09d91505b90c..5240432e6d1d 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -8,6 +8,7 @@
  * Kevin D. Kissell, kevink@mips.com and Carsten Langgaard, carstenl@mips.com
  * Copyright (C) 2000 MIPS Technologies, Inc.  All rights reserved.
  */
+#include <linux/bug.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/signal.h>
@@ -132,6 +133,8 @@ void *kmap_coherent(struct page *page, unsigned long addr)
         pte_t pte;
         int tlbidx;
 
+        BUG_ON(Page_dcache_dirty(page));
+
         inc_preempt_count();
         idx = (addr >> PAGE_SHIFT) & (FIX_N_COLOURS - 1);
 #ifdef CONFIG_MIPS_MT_SMTC
@@ -208,7 +211,7 @@ void copy_user_highpage(struct page *to, struct page *from,
         void *vfrom, *vto;
 
         vto = kmap_atomic(to, KM_USER1);
-        if (cpu_has_dc_aliases) {
+        if (cpu_has_dc_aliases && !Page_dcache_dirty(from)) {
                 vfrom = kmap_coherent(from, vaddr);
                 copy_page(vto, vfrom);
                 kunmap_coherent();
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 4ec0964b8394..9cb39644b6f1 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -78,7 +78,7 @@ enum fields
         SET = 0x200
 };
 
-#define OP_MASK         0x2f
+#define OP_MASK         0x3f
 #define OP_SH           26
 #define RS_MASK         0x1f
 #define RS_SH           21
@@ -92,7 +92,7 @@ enum fields
 #define IMM_SH          0
 #define JIMM_MASK       0x3ffffff
 #define JIMM_SH         0
-#define FUNC_MASK       0x2f
+#define FUNC_MASK       0x3f
 #define FUNC_SH         0
 #define SET_MASK        0x7
 #define SET_SH          0