From 9b5e809a8f2cae42634c4f95a60b7a811477b429 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 1 Jul 2007 18:37:12 +0000 Subject: nuke broadcom 2.6.21 patches - 2.6.22-rc6 is more stable and more up to date git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7836 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../brcm47xx-2.6/patches/160-kmap_coherent.patch | 57 ---------------------- 1 file changed, 57 deletions(-) delete mode 100644 target/linux/brcm47xx-2.6/patches/160-kmap_coherent.patch (limited to 'target/linux/brcm47xx-2.6/patches/160-kmap_coherent.patch') diff --git a/target/linux/brcm47xx-2.6/patches/160-kmap_coherent.patch b/target/linux/brcm47xx-2.6/patches/160-kmap_coherent.patch deleted file mode 100644 index 706a20f83e..0000000000 --- a/target/linux/brcm47xx-2.6/patches/160-kmap_coherent.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- ./arch/mips/mm/init.c.orig 2007-03-22 08:08:34.000000000 -0600 -+++ ./arch/mips/mm/init.c 2007-03-22 08:09:04.000000000 -0600 -@@ -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(from); -@@ -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(page); -@@ -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); ---- ./include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h.orig 2007-03-22 08:10:54.000000000 -0600 -+++ ./include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h 2007-03-22 08:10:50.000000000 -0600 -@@ -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 */ ---- ./include/asm-mips/cpu-features.h.orig 2007-03-22 08:09:16.000000000 -0600 -+++ ./include/asm-mips/cpu-features.h 2007-03-22 08:09:52.000000000 -0600 -@@ -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 -- cgit v1.2.3