67068081d11253ff9a91da3e29f93fc6c8c17ba4
[openwrt/svn-archive/archive.git] / target / linux / brcm47xx-2.6 / patches-2.6.22 / 160-kmap_coherent.patch
1 Index: linux-2.6.22-rc4/arch/mips/mm/init.c
2 ===================================================================
3 --- linux-2.6.22-rc4.orig/arch/mips/mm/init.c 2007-06-10 21:32:12.000000000 +0100
4 +++ linux-2.6.22-rc4/arch/mips/mm/init.c 2007-06-10 21:33:21.000000000 +0100
5 @@ -207,7 +207,7 @@
6 void *vfrom, *vto;
7
8 vto = kmap_atomic(to, KM_USER1);
9 - if (cpu_has_dc_aliases) {
10 + if (cpu_has_dc_aliases && cpu_use_kmap_coherent) {
11 vfrom = kmap_coherent(from, vaddr);
12 copy_page(vto, vfrom);
13 kunmap_coherent();
14 @@ -230,7 +230,7 @@
15 struct page *page, unsigned long vaddr, void *dst, const void *src,
16 unsigned long len)
17 {
18 - if (cpu_has_dc_aliases) {
19 + if (cpu_has_dc_aliases && cpu_use_kmap_coherent) {
20 void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
21 memcpy(vto, src, len);
22 kunmap_coherent();
23 @@ -246,7 +246,7 @@
24 struct page *page, unsigned long vaddr, void *dst, const void *src,
25 unsigned long len)
26 {
27 - if (cpu_has_dc_aliases) {
28 + if (cpu_has_dc_aliases && cpu_use_kmap_coherent) {
29 void *vfrom =
30 kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
31 memcpy(dst, vfrom, len);
32 Index: linux-2.6.22-rc4/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h
33 ===================================================================
34 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
35 +++ linux-2.6.22-rc4/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h 2007-06-10 21:33:21.000000000 +0100
36 @@ -0,0 +1,13 @@
37 +/*
38 + * This file is subject to the terms and conditions of the GNU General Public
39 + * License. See the file "COPYING" in the main directory of this archive
40 + * for more details.
41 + *
42 + * Copyright (C) 2005 Ralf Baechle (ralf@linux-mips.org)
43 + */
44 +#ifndef __ASM_MACH_BCM947XX_CPU_FEATURE_OVERRIDES_H
45 +#define __ASM_MACH_BCM947XX_CPU_FEATURE_OVERRIDES_H
46 +
47 +#define cpu_use_kmap_coherent 0
48 +
49 +#endif /* __ASM_MACH_BCM947XX_CPU_FEATURE_OVERRIDES_H */
50 Index: linux-2.6.22-rc4/include/asm-mips/cpu-features.h
51 ===================================================================
52 --- linux-2.6.22-rc4.orig/include/asm-mips/cpu-features.h 2007-06-10 21:32:12.000000000 +0100
53 +++ linux-2.6.22-rc4/include/asm-mips/cpu-features.h 2007-06-10 21:33:21.000000000 +0100
54 @@ -101,6 +101,9 @@
55 #ifndef cpu_has_pindexed_dcache
56 #define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX)
57 #endif
58 +#ifndef cpu_use_kmap_coherent
59 +#define cpu_use_kmap_coherent 1
60 +#endif
61
62 /*
63 * I-Cache snoops remote store. This only matters on SMP. Some multiprocessors