diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-18 18:22:50 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-18 18:22:50 +0000 |
| commit | b7ab10d53e7e0285aa75319a75b78bc9675ead57 (patch) | |
| tree | 9b2a24436bad611f5f67eb2380bff949a5151983 /target/linux/brcm47xx/patches-2.6.34/160-kmap_coherent.patch | |
| parent | cb5f2669a191c818bde15f7b2f8b0860fe6e5e37 (diff) | |
brcm47xx: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20996 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.34/160-kmap_coherent.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.34/160-kmap_coherent.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.34/160-kmap_coherent.patch b/target/linux/brcm47xx/patches-2.6.34/160-kmap_coherent.patch index 9cba353da3..4a71a6fc6d 100644 --- a/target/linux/brcm47xx/patches-2.6.34/160-kmap_coherent.patch +++ b/target/linux/brcm47xx/patches-2.6.34/160-kmap_coherent.patch @@ -1,6 +1,6 @@ --- a/arch/mips/include/asm/cpu-features.h +++ b/arch/mips/include/asm/cpu-features.h -@@ -107,6 +107,9 @@ +@@ -110,6 +110,9 @@ #ifndef cpu_has_pindexed_dcache #define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX) #endif @@ -48,7 +48,7 @@ kunmap_atomic(vaddr, KM_USER0); --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c -@@ -209,7 +209,7 @@ void copy_user_highpage(struct page *to, +@@ -210,7 +210,7 @@ void copy_user_highpage(struct page *to, void *vfrom, *vto; vto = kmap_atomic(to, KM_USER1); @@ -57,7 +57,7 @@ page_mapped(from) && !Page_dcache_dirty(from)) { vfrom = kmap_coherent(from, vaddr); copy_page(vto, vfrom); -@@ -231,7 +231,7 @@ void copy_to_user_page(struct vm_area_st +@@ -232,7 +232,7 @@ void copy_to_user_page(struct vm_area_st struct page *page, unsigned long vaddr, void *dst, const void *src, unsigned long len) { @@ -66,7 +66,7 @@ page_mapped(page) && !Page_dcache_dirty(page)) { void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); memcpy(vto, src, len); -@@ -249,7 +249,7 @@ void copy_from_user_page(struct vm_area_ +@@ -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) { |