ar71xx: fix 2.6.34 build errors

[openwrt.git] / target / linux / brcm47xx / patches-2.6.32 / 160-kmap_coherent.patch

diff --git a/target/linux/brcm47xx/patches-2.6.32/160-kmap_coherent.patch b/target/linux/brcm47xx/patches-2.6.32/160-kmap_coherent.patch
index ef1cacd..9cba353 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.32/160-kmap_coherent.patch
+++ b/target/linux/brcm47xx/patches-2.6.32/160-kmap_coherent.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/include/asm/cpu-features.h
 +++ b/arch/mips/include/asm/cpu-features.h
-@@ -104,6 +104,9 @@
+@@ -107,6 +107,9 @@
  #ifndef cpu_has_pindexed_dcache
  #define cpu_has_pindexed_dcache       (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX)
  #endif
@@ -28,7 +28,7 @@
 +#endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */
 --- a/arch/mips/mm/c-r4k.c
 +++ b/arch/mips/mm/c-r4k.c
-@@ -494,7 +494,7 @@ static inline void local_r4k_flush_cache
+@@ -507,7 +507,7 @@ static inline void local_r4k_flush_cache
                 */
                map_coherent = (cpu_has_dc_aliases &&
                                page_mapped(page) && !Page_dcache_dirty(page));
@@ -37,7 +37,7 @@
                        vaddr = kmap_coherent(page, addr);
                else
                        vaddr = kmap_atomic(page, KM_USER0);
-@@ -517,7 +517,7 @@ static inline void local_r4k_flush_cache
+@@ -530,7 +530,7 @@ static inline void local_r4k_flush_cache
        }
  
        if (vaddr) {
@@ -48,7 +48,7 @@
                        kunmap_atomic(vaddr, KM_USER0);
 --- a/arch/mips/mm/init.c
 +++ b/arch/mips/mm/init.c
-@@ -204,7 +204,7 @@ void copy_user_highpage(struct page *to,
+@@ -209,7 +209,7 @@ void copy_user_highpage(struct page *to,
        void *vfrom, *vto;
  
        vto = kmap_atomic(to, KM_USER1);
@@ -57,7 +57,7 @@
            page_mapped(from) && !Page_dcache_dirty(from)) {
                vfrom = kmap_coherent(from, vaddr);
                copy_page(vto, vfrom);
-@@ -226,7 +226,7 @@ void copy_to_user_page(struct vm_area_st
+@@ -231,7 +231,7 @@ void copy_to_user_page(struct vm_area_st
        struct page *page, unsigned long vaddr, void *dst, const void *src,
        unsigned long len)
  {
@@ -66,7 +66,7 @@
            page_mapped(page) && !Page_dcache_dirty(page)) {
                void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
                memcpy(vto, src, len);
-@@ -244,7 +244,7 @@ void copy_from_user_page(struct vm_area_
+@@ -249,7 +249,7 @@ void copy_from_user_page(struct vm_area_
        struct page *page, unsigned long vaddr, void *dst, const void *src,
        unsigned long len)
  {