--- ./arch/mips/mm/init.c.orig	2007-03-22 08:08:34.000000000 -0600
+++ ./arch/mips/mm/init.c	2007-03-22 08:09:04.000000000 -0600
@@ -207,7 +207,7 @@
 	struct page *page, unsigned long vaddr, void *dst, const void *src,
 	unsigned long len)
 {
-	if (cpu_has_dc_aliases) {
+	if (cpu_has_dc_aliases && cpu_use_kmap_coherent) {
 		void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
 		memcpy(vto, src, len);
 		kunmap_coherent(page);
@@ -223,7 +223,7 @@
 	struct page *page, unsigned long vaddr, void *dst, const void *src,
 	unsigned long len)
 {
-	if (cpu_has_dc_aliases) {
+	if (cpu_has_dc_aliases && cpu_use_kmap_coherent) {
 		void *vfrom =
 			kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
 		memcpy(dst, vfrom, len);
--- ./include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h.orig	2007-03-22 08:10:54.000000000 -0600
+++ ./include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h	2007-03-22 08:10:50.000000000 -0600
@@ -0,0 +1,13 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2005 Ralf Baechle (ralf@linux-mips.org)
+ */
+#ifndef __ASM_MACH_BCM947XX_CPU_FEATURE_OVERRIDES_H
+#define __ASM_MACH_BCM947XX_CPU_FEATURE_OVERRIDES_H
+
+#define cpu_use_kmap_coherent	0
+
+#endif /* __ASM_MACH_BCM947XX_CPU_FEATURE_OVERRIDES_H */
--- ./include/asm-mips/cpu-features.h.orig	2007-03-22 08:09:16.000000000 -0600
+++ ./include/asm-mips/cpu-features.h	2007-03-22 08:09:52.000000000 -0600
@@ -98,6 +98,9 @@
 #ifndef cpu_has_pindexed_dcache
 #define cpu_has_pindexed_dcache	(cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX)
 #endif
+#ifndef cpu_use_kmap_coherent
+#define cpu_use_kmap_coherent 1
+#endif
 
 /*
  * I-Cache snoops remote store.  This only matters on SMP.  Some multiprocessors