OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 27... Line 27...
27 +#define cpu_use_kmap_coherent 0 27 +#define cpu_use_kmap_coherent 0
28 + 28 +
29 #endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */ 29 #endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */
30 --- a/arch/mips/mm/c-r4k.c 30 --- a/arch/mips/mm/c-r4k.c
31 +++ b/arch/mips/mm/c-r4k.c 31 +++ b/arch/mips/mm/c-r4k.c
32 @@ -694,7 +694,7 @@ static inline void local_r4k_flush_cache 32 @@ -672,7 +672,7 @@ static inline void local_r4k_flush_cache
33 map_coherent = (cpu_has_dc_aliases && 33 map_coherent = (cpu_has_dc_aliases &&
34 page_mapcount(page) && 34 page_mapcount(page) &&
35 !Page_dcache_dirty(page)); 35 !Page_dcache_dirty(page));
36 - if (map_coherent) 36 - if (map_coherent)
37 + if (map_coherent && cpu_use_kmap_coherent) 37 + if (map_coherent && cpu_use_kmap_coherent)
38 vaddr = kmap_coherent(page, addr); 38 vaddr = kmap_coherent(page, addr);
39 else 39 else
40 vaddr = kmap_atomic(page); 40 vaddr = kmap_atomic(page);
41 @@ -719,7 +719,7 @@ static inline void local_r4k_flush_cache 41 @@ -697,7 +697,7 @@ static inline void local_r4k_flush_cache
42 } 42 }
Line 43... Line 43...
43 43
44 if (vaddr) { 44 if (vaddr) {
45 - if (map_coherent) 45 - if (map_coherent)