bcm47xx compile fix for .21, thanks to noz

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

diff --git a/target/linux/brcm47xx-2.6/patches/160-kmap_coherent.patch b/target/linux/brcm47xx-2.6/patches/160-kmap_coherent.patch
index b8847bd028048356e0e529c7284016b15c7ef01c..706a20f83ed660c59a468912fba217f51ded575c 100644 (file)
--- a/target/linux/brcm47xx-2.6/patches/160-kmap_coherent.patch
+++ b/target/linux/brcm47xx-2.6/patches/160-kmap_coherent.patch
@@ -1,6 +1,15 @@
 --- ./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 @@
+       void *vfrom, *vto;
+ 
+       vto = kmap_atomic(to, KM_USER1);
+-      if (cpu_has_dc_aliases) {
++      if (cpu_has_dc_aliases && cpu_use_kmap_coherent) {
+               vfrom = kmap_coherent(from, vaddr);
+               copy_page(vto, vfrom);
+               kunmap_coherent(from);
+@@ -230,7 +230,7 @@
        struct page *page, unsigned long vaddr, void *dst, const void *src,
        unsigned long len)
  {
@@ -9,7 +18,7 @@
                void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
                memcpy(vto, src, len);
                kunmap_coherent(page);
-@@ -223,7 +223,7 @@
+@@ -246,7 +246,7 @@
        struct page *page, unsigned long vaddr, void *dst, const void *src,
        unsigned long len)
  {
@@ -36,7 +45,7 @@
 +#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 @@
+@@ -101,6 +101,9 @@
  #ifndef cpu_has_pindexed_dcache
  #define cpu_has_pindexed_dcache       (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX)
  #endif