From 478b3b32f429be04c317e7aa1eb44241dd3429e1 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Tue, 17 Jun 2008 12:57:04 +0000 Subject: [kernel] upgrade to 2.6.25.7, and refresh patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11523 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-2.6.25/160-kmap_coherent.patch | 32 ++++++++-------------- 1 file changed, 12 insertions(+), 20 deletions(-) (limited to 'target/linux/brcm47xx/patches-2.6.25/160-kmap_coherent.patch') diff --git a/target/linux/brcm47xx/patches-2.6.25/160-kmap_coherent.patch b/target/linux/brcm47xx/patches-2.6.25/160-kmap_coherent.patch index 3db02d663d..725fb3c7ed 100644 --- a/target/linux/brcm47xx/patches-2.6.25/160-kmap_coherent.patch +++ b/target/linux/brcm47xx/patches-2.6.25/160-kmap_coherent.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.25.4/arch/mips/mm/init.c -=================================================================== ---- linux-2.6.25.4.orig/arch/mips/mm/init.c -+++ linux-2.6.25.4/arch/mips/mm/init.c -@@ -211,7 +211,7 @@ void copy_user_highpage(struct page *to, +--- a/arch/mips/mm/init.c ++++ b/arch/mips/mm/init.c +@@ -211,7 +211,7 @@ void *vfrom, *vto; vto = kmap_atomic(to, KM_USER1); @@ -11,7 +9,7 @@ Index: linux-2.6.25.4/arch/mips/mm/init.c page_mapped(from) && !Page_dcache_dirty(from)) { vfrom = kmap_coherent(from, vaddr); copy_page(vto, vfrom); -@@ -235,7 +235,7 @@ void copy_to_user_page(struct vm_area_st +@@ -235,7 +235,7 @@ struct page *page, unsigned long vaddr, void *dst, const void *src, unsigned long len) { @@ -20,7 +18,7 @@ Index: linux-2.6.25.4/arch/mips/mm/init.c page_mapped(page) && !Page_dcache_dirty(page)) { void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); memcpy(vto, src, len); -@@ -255,7 +255,7 @@ void copy_from_user_page(struct vm_area_ +@@ -255,7 +255,7 @@ struct page *page, unsigned long vaddr, void *dst, const void *src, unsigned long len) { @@ -29,10 +27,8 @@ Index: linux-2.6.25.4/arch/mips/mm/init.c page_mapped(page) && !Page_dcache_dirty(page)) { void *vfrom = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); memcpy(dst, vfrom, len); -Index: linux-2.6.25.4/include/asm-mips/mach-bcm47xx/cpu-feature-overrides.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/asm-mips/mach-bcm47xx/cpu-feature-overrides.h ++++ b/include/asm-mips/mach-bcm47xx/cpu-feature-overrides.h @@ -0,0 +1,13 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public @@ -47,10 +43,8 @@ Index: linux-2.6.25.4/include/asm-mips/mach-bcm47xx/cpu-feature-overrides.h +#define cpu_use_kmap_coherent 0 + +#endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */ -Index: linux-2.6.25.4/include/asm-mips/cpu-features.h -=================================================================== ---- linux-2.6.25.4.orig/include/asm-mips/cpu-features.h -+++ linux-2.6.25.4/include/asm-mips/cpu-features.h +--- a/include/asm-mips/cpu-features.h ++++ b/include/asm-mips/cpu-features.h @@ -101,6 +101,9 @@ #ifndef cpu_has_pindexed_dcache #define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX) @@ -61,11 +55,9 @@ Index: linux-2.6.25.4/include/asm-mips/cpu-features.h /* * I-Cache snoops remote store. This only matters on SMP. Some multiprocessors -Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c -=================================================================== ---- linux-2.6.25.4.orig/arch/mips/mm/c-r4k.c -+++ linux-2.6.25.4/arch/mips/mm/c-r4k.c -@@ -484,7 +484,7 @@ static inline void local_r4k_flush_cache +--- a/arch/mips/mm/c-r4k.c ++++ b/arch/mips/mm/c-r4k.c +@@ -484,7 +484,7 @@ * Use kmap_coherent or kmap_atomic to do flushes for * another ASID than the current one. */ @@ -74,7 +66,7 @@ Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c vaddr = kmap_coherent(page, addr); else vaddr = kmap_atomic(page, KM_USER0); -@@ -505,7 +505,7 @@ static inline void local_r4k_flush_cache +@@ -505,7 +505,7 @@ } if (vaddr) { -- cgit v1.2.3