Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c02048f authored by Cong Wang's avatar Cong Wang Committed by Cong Wang
Browse files

mips: remove the second argument of k[un]map_atomic() 



Signed-off-by: default avatarCong Wang <amwang@redhat.com>
parent 5472e862

arch/mips/mm/c-r4k.c

+2 −2
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ static inline void local_r4k_flush_cache_page(void *args) 
		if (map_coherent)

			vaddr = kmap_coherent(page, addr);

		else

			vaddr = kmap_atomic(page, KM_USER0);

			vaddr = kmap_atomic(page);

		addr = (unsigned long)vaddr;

	}
@@ -521,7 +521,7 @@ static inline void local_r4k_flush_cache_page(void *args) 
		if (map_coherent)

			kunmap_coherent();

		else

			kunmap_atomic(vaddr, KM_USER0);

			kunmap_atomic(vaddr);

	}

}

arch/mips/mm/init.c

+4 −4
Original line number Diff line number Diff line
@@ -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();

}