brcm47xx: backport BCM47XX Linksys WRT54G series patches

[openwrt/svn-archive/archive.git] / target / linux / brcm47xx / patches-3.10 / 160-kmap_coherent.patch

diff --git a/target/linux/brcm47xx/patches-3.10/160-kmap_coherent.patch b/target/linux/brcm47xx/patches-3.10/160-kmap_coherent.patch
index 6317f5ce8cdf9057f145b7a933e4f0da264029b2..3c9f550636765d332284e6c0d1a959919e54507b 100644 (file)
--- a/target/linux/brcm47xx/patches-3.10/160-kmap_coherent.patch
+++ b/target/linux/brcm47xx/patches-3.10/160-kmap_coherent.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/include/asm/cpu-features.h
 +++ b/arch/mips/include/asm/cpu-features.h
-@@ -116,6 +116,9 @@
+@@ -120,6 +120,9 @@
  #ifndef cpu_has_local_ebase
  #define cpu_has_local_ebase   1
  #endif
@@ -10,22 +10,15 @@
  
  /*
   * I-Cache snoops remote store.        This only matters on SMP.  Some multiprocessors
---- /dev/null
+--- a/arch/mips/include/asm/mach-bcm47xx/cpu-feature-overrides.h
 +++ b/arch/mips/include/asm/mach-bcm47xx/cpu-feature-overrides.h
-@@ -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_BCM47XX_CPU_FEATURE_OVERRIDES_H
-+#define __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H
-+
-+#define cpu_use_kmap_coherent 0
+@@ -79,4 +79,6 @@
+ #define cpu_scache_line_size()                0
+ #define cpu_has_vz                    0
+ 
++#define cpu_use_kmap_coherent         0
 +
-+#endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */
+ #endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */
 --- a/arch/mips/mm/c-r4k.c
 +++ b/arch/mips/mm/c-r4k.c
 @@ -509,7 +509,7 @@ static inline void local_r4k_flush_cache