|
@@ -207,21 +207,21 @@ void copy_user_highpage(struct page *to, struct page *from,
|
|
|
{
|
|
|
void *vfrom, *vto;
|
|
|
|
|
|
- vto = kmap_atomic(to, KM_USER1);
|
|
|
+ vto = kmap_atomic(to);
|
|
|
if (cpu_has_dc_aliases &&
|
|
|
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);
|
|
|
+ vfrom = kmap_atomic(from);
|
|
|
copy_page(vto, vfrom);
|
|
|
- kunmap_atomic(vfrom, KM_USER0);
|
|
|
+ kunmap_atomic(vfrom);
|
|
|
}
|
|
|
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);
|
|
|
+ kunmap_atomic(vto);
|
|
|
/* Make sure this page is cleared on other CPU's too before using it */
|
|
|
smp_wmb();
|
|
|
}
|