mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 09:12:39 +00:00
95 lines
3.4 KiB
Diff
95 lines
3.4 KiB
Diff
Index: linux-2.6.22-rc5/arch/mips/mm/init.c
|
|
===================================================================
|
|
--- linux-2.6.22-rc5.orig/arch/mips/mm/init.c 2007-06-27 23:40:06.406545264 +0200
|
|
+++ linux-2.6.22-rc5/arch/mips/mm/init.c 2007-06-27 23:40:08.920163136 +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-rc5/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h
|
|
===================================================================
|
|
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
|
+++ linux-2.6.22-rc5/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h 2007-06-27 23:40:08.921162984 +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-rc5/include/asm-mips/cpu-features.h
|
|
===================================================================
|
|
--- linux-2.6.22-rc5.orig/include/asm-mips/cpu-features.h 2007-06-27 23:40:06.419543288 +0200
|
|
+++ linux-2.6.22-rc5/include/asm-mips/cpu-features.h 2007-06-27 23:40:08.921162984 +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
|
|
Index: linux-2.6.22-rc5/arch/mips/mm/c-r4k.c
|
|
===================================================================
|
|
--- linux-2.6.22-rc5.orig/arch/mips/mm/c-r4k.c 2007-06-27 23:40:45.883543848 +0200
|
|
+++ linux-2.6.22-rc5/arch/mips/mm/c-r4k.c 2007-06-27 23:42:06.682260576 +0200
|
|
@@ -339,7 +339,7 @@
|
|
|
|
static void r4k_flush_cache_all(void)
|
|
{
|
|
- if (!cpu_has_dc_aliases)
|
|
+ if (!cpu_has_dc_aliases || !cpu_use_kmap_coherent)
|
|
return;
|
|
|
|
r4k_on_each_cpu(local_r4k_flush_cache_all, NULL, 1, 1);
|
|
@@ -380,7 +380,7 @@
|
|
static void r4k_flush_cache_range(struct vm_area_struct *vma,
|
|
unsigned long start, unsigned long end)
|
|
{
|
|
- if (!cpu_has_dc_aliases)
|
|
+ if (!cpu_has_dc_aliases || !cpu_use_kmap_coherent)
|
|
return;
|
|
|
|
r4k_on_each_cpu(local_r4k_flush_cache_range, vma, 1, 1);
|
|
@@ -412,7 +412,7 @@
|
|
|
|
static void r4k_flush_cache_mm(struct mm_struct *mm)
|
|
{
|
|
- if (!cpu_has_dc_aliases)
|
|
+ if (!cpu_has_dc_aliases || !cpu_use_kmap_coherent)
|
|
return;
|
|
|
|
r4k_on_each_cpu(local_r4k_flush_cache_mm, mm, 1, 1);
|