diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2008-05-19 08:08:23 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2008-05-19 08:08:23 +0000 |
commit | 18c2ac7fd73cb71300d6de0abc044a88296f196e (patch) | |
tree | bba15878199743d9aa9123f57b47a2e4a7e2f672 /target/linux/brcm47xx/patches-2.6.23/160-kmap_coherent.patch | |
parent | 7fcae2b69aebe6554c5a85167bea441116fc9daa (diff) | |
download | master-187ad058-18c2ac7fd73cb71300d6de0abc044a88296f196e.tar.gz master-187ad058-18c2ac7fd73cb71300d6de0abc044a88296f196e.tar.bz2 master-187ad058-18c2ac7fd73cb71300d6de0abc044a88296f196e.zip |
[brcm47xx] refresh kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11200 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.23/160-kmap_coherent.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-2.6.23/160-kmap_coherent.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.23/160-kmap_coherent.patch b/target/linux/brcm47xx/patches-2.6.23/160-kmap_coherent.patch index 8a3bd0ec74..753e5ad42f 100644 --- a/target/linux/brcm47xx/patches-2.6.23/160-kmap_coherent.patch +++ b/target/linux/brcm47xx/patches-2.6.23/160-kmap_coherent.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.23/arch/mips/mm/init.c +Index: linux-2.6.23.17/arch/mips/mm/init.c =================================================================== ---- linux-2.6.23.orig/arch/mips/mm/init.c 2007-10-09 22:31:38.000000000 +0200 -+++ linux-2.6.23/arch/mips/mm/init.c 2007-10-13 02:57:18.483434538 +0200 -@@ -211,7 +211,7 @@ +--- linux-2.6.23.17.orig/arch/mips/mm/init.c ++++ linux-2.6.23.17/arch/mips/mm/init.c +@@ -211,7 +211,7 @@ void copy_user_highpage(struct page *to, void *vfrom, *vto; vto = kmap_atomic(to, KM_USER1); @@ -11,7 +11,7 @@ Index: linux-2.6.23/arch/mips/mm/init.c vfrom = kmap_coherent(from, vaddr); copy_page(vto, vfrom); kunmap_coherent(); -@@ -234,7 +234,7 @@ +@@ -234,7 +234,7 @@ void copy_to_user_page(struct vm_area_st struct page *page, unsigned long vaddr, void *dst, const void *src, unsigned long len) { @@ -20,7 +20,7 @@ Index: linux-2.6.23/arch/mips/mm/init.c void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); memcpy(vto, src, len); kunmap_coherent(); -@@ -250,7 +250,7 @@ +@@ -250,7 +250,7 @@ void copy_from_user_page(struct vm_area_ struct page *page, unsigned long vaddr, void *dst, const void *src, unsigned long len) { @@ -29,10 +29,10 @@ Index: linux-2.6.23/arch/mips/mm/init.c void *vfrom = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); memcpy(dst, vfrom, len); -Index: linux-2.6.23/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h +Index: linux-2.6.23.17/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.23/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h 2007-10-13 02:56:22.020216880 +0200 +--- /dev/null ++++ linux-2.6.23.17/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h @@ -0,0 +1,13 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public @@ -47,10 +47,10 @@ Index: linux-2.6.23/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h +#define cpu_use_kmap_coherent 0 + +#endif /* __ASM_MACH_BCM947XX_CPU_FEATURE_OVERRIDES_H */ -Index: linux-2.6.23/include/asm-mips/cpu-features.h +Index: linux-2.6.23.17/include/asm-mips/cpu-features.h =================================================================== ---- linux-2.6.23.orig/include/asm-mips/cpu-features.h 2007-10-09 22:31:38.000000000 +0200 -+++ linux-2.6.23/include/asm-mips/cpu-features.h 2007-10-13 02:56:22.028217337 +0200 +--- linux-2.6.23.17.orig/include/asm-mips/cpu-features.h ++++ linux-2.6.23.17/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) |