aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.32/310-no_highpage.patch
diff options
context:
space:
mode:
authorMichael Büsch <mb@bu3sch.de>2010-01-07 16:06:05 +0000
committerMichael Büsch <mb@bu3sch.de>2010-01-07 16:06:05 +0000
commitc97341b7614c25b30f19856e300718114ab1435f (patch)
tree0beba5487769e9bd66ddfcee2ffcb2a2896d3041 /target/linux/brcm47xx/patches-2.6.32/310-no_highpage.patch
parentd7272853a2c6d34751637be12e7d451504f02f3f (diff)
downloadupstream-c97341b7614c25b30f19856e300718114ab1435f.tar.gz
upstream-c97341b7614c25b30f19856e300718114ab1435f.tar.bz2
upstream-c97341b7614c25b30f19856e300718114ab1435f.zip
bcm47xx: Add basic 2.6.32 support.
SVN-Revision: 19062
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.32/310-no_highpage.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.32/310-no_highpage.patch66
1 files changed, 66 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.32/310-no_highpage.patch b/target/linux/brcm47xx/patches-2.6.32/310-no_highpage.patch
new file mode 100644
index 0000000000..45ce36a115
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.32/310-no_highpage.patch
@@ -0,0 +1,66 @@
+--- a/arch/mips/include/asm/page.h
++++ b/arch/mips/include/asm/page.h
+@@ -35,6 +35,7 @@
+ #ifndef __ASSEMBLY__
+
+ #include <linux/pfn.h>
++#include <asm/cpu-features.h>
+ #include <asm/io.h>
+
+ extern void build_clear_page(void);
+@@ -70,13 +71,16 @@ static inline void clear_user_page(void
+ flush_data_cache_page((unsigned long)addr);
+ }
+
+-extern void copy_user_page(void *vto, void *vfrom, unsigned long vaddr,
+- struct page *to);
+-struct vm_area_struct;
+-extern void copy_user_highpage(struct page *to, struct page *from,
+- unsigned long vaddr, struct vm_area_struct *vma);
++static inline void copy_user_page(void *vto, void *vfrom, unsigned long vaddr,
++ struct page *to)
++{
++ extern void (*flush_data_cache_page)(unsigned long addr);
+
+-#define __HAVE_ARCH_COPY_USER_HIGHPAGE
++ copy_page(vto, vfrom);
++ if (!cpu_has_ic_fills_f_dc ||
++ pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK))
++ flush_data_cache_page((unsigned long)vto);
++}
+
+ /*
+ * These are used to make use of C type-checking..
+--- a/arch/mips/mm/init.c
++++ b/arch/mips/mm/init.c
+@@ -198,30 +198,6 @@ void kunmap_coherent(void)
+ preempt_check_resched();
+ }
+
+-void copy_user_highpage(struct page *to, struct page *from,
+- unsigned long vaddr, struct vm_area_struct *vma)
+-{
+- void *vfrom, *vto;
+-
+- vto = kmap_atomic(to, KM_USER1);
+- if (cpu_has_dc_aliases && cpu_use_kmap_coherent &&
+- page_mapped(from) && !Page_dcache_dirty(from)) {
+- vfrom = kmap_coherent(from, vaddr);
+- copy_page(vto, vfrom);
+- kunmap_coherent();
+- } else {
+- vfrom = kmap_atomic(from, KM_USER0);
+- copy_page(vto, vfrom);
+- kunmap_atomic(vfrom, KM_USER0);
+- }
+- if ((!cpu_has_ic_fills_f_dc) ||
+- pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK))
+- flush_data_cache_page((unsigned long)vto);
+- kunmap_atomic(vto, KM_USER1);
+- /* Make sure this page is cleared on other CPU's too before using it */
+- smp_wmb();
+-}
+-
+ void copy_to_user_page(struct vm_area_struct *vma,
+ struct page *page, unsigned long vaddr, void *dst, const void *src,
+ unsigned long len)