2010-03-02 23:16:18 +02:00
|
|
|
--- a/arch/mips/include/asm/page.h
|
|
|
|
|
+++ b/arch/mips/include/asm/page.h
|
|
|
|
|
@@ -43,6 +43,7 @@
|
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
|
|
|
|
|
|
#include <linux/pfn.h>
|
|
|
|
|
+#include <asm/cpu-features.h>
|
|
|
|
|
#include <asm/io.h>
|
|
|
|
|
|
|
|
|
|
extern void build_clear_page(void);
|
2010-05-23 16:17:56 +03:00
|
|
|
@@ -78,13 +79,16 @@ static inline void clear_user_page(void
|
2010-03-02 23:16:18 +02:00
|
|
|
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
|
|
|
|
|
@@ -203,30 +203,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)
|
