diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-09-06 16:27:37 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-09-06 16:27:37 +0000 |
| commit | 56231056ea784f1cec6450f649b1adaed1f56366 (patch) | |
| tree | 7b130d72d854cde2bcd3af8b11bd0f7be3dbff6a /target/linux/brcm47xx/patches-2.6.22/160-kmap_coherent.patch | |
| parent | e1184aaa1a7a5e5eeef8e072bf0ea98c291be22a (diff) | |
| download | mtk-20170518-56231056ea784f1cec6450f649b1adaed1f56366.zip mtk-20170518-56231056ea784f1cec6450f649b1adaed1f56366.tar.gz mtk-20170518-56231056ea784f1cec6450f649b1adaed1f56366.tar.bz2 | |
strip the kernel version suffix from target directories, except for brcm-2.4 (the -2.4 will be included in the board name here). CONFIG_LINUX_<ver>_<board> becomes CONFIG_TARGET_<board>, same for profiles.
SVN-Revision: 8653
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.22/160-kmap_coherent.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.22/160-kmap_coherent.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.22/160-kmap_coherent.patch b/target/linux/brcm47xx/patches-2.6.22/160-kmap_coherent.patch new file mode 100644 index 0000000..1267602 --- /dev/null +++ b/target/linux/brcm47xx/patches-2.6.22/160-kmap_coherent.patch @@ -0,0 +1,63 @@ +Index: linux-2.6.22-rc6/arch/mips/mm/init.c +=================================================================== +--- linux-2.6.22-rc6.orig/arch/mips/mm/init.c 2007-07-04 02:17:11.423962000 +0200 ++++ linux-2.6.22-rc6/arch/mips/mm/init.c 2007-07-04 02:17:31.269202250 +0200 +@@ -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(); +@@ -230,7 +230,7 @@ + struct page *page, unsigned long vaddr, void *dst, const void *src, + unsigned long len) + { +- if (cpu_has_dc_aliases) { ++ if (cpu_has_dc_aliases && cpu_use_kmap_coherent) { + void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); + memcpy(vto, src, len); + kunmap_coherent(); +@@ -246,7 +246,7 @@ + struct page *page, unsigned long vaddr, void *dst, const void *src, + unsigned long len) + { +- if (cpu_has_dc_aliases) { ++ if (cpu_has_dc_aliases && cpu_use_kmap_coherent) { + void *vfrom = + kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); + memcpy(dst, vfrom, len); +Index: linux-2.6.22-rc6/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.22-rc6/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h 2007-07-04 02:17:31.273202500 +0200 +@@ -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_BCM947XX_CPU_FEATURE_OVERRIDES_H ++#define __ASM_MACH_BCM947XX_CPU_FEATURE_OVERRIDES_H ++ ++#define cpu_use_kmap_coherent 0 ++ ++#endif /* __ASM_MACH_BCM947XX_CPU_FEATURE_OVERRIDES_H */ +Index: linux-2.6.22-rc6/include/asm-mips/cpu-features.h +=================================================================== +--- linux-2.6.22-rc6.orig/include/asm-mips/cpu-features.h 2007-07-04 02:17:11.455964000 +0200 ++++ linux-2.6.22-rc6/include/asm-mips/cpu-features.h 2007-07-04 02:17:31.305204500 +0200 +@@ -101,6 +101,9 @@ + #ifndef cpu_has_pindexed_dcache + #define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX) + #endif ++#ifndef cpu_use_kmap_coherent ++#define cpu_use_kmap_coherent 1 ++#endif + + /* + * I-Cache snoops remote store. This only matters on SMP. Some multiprocessors |