From: Cong Wang Date: Fri, 25 Nov 2011 15:14:17 +0000 (+0800) Subject: um: remove the second argument of k[un]map_atomic() X-Git-Tag: Ubuntu-5.2.0-15.16~18523^2~52 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=91f2359396d87f24ea43d91ff77dec54847ad69a;p=mirror_ubuntu-eoan-kernel.git um: remove the second argument of k[un]map_atomic() Signed-off-by: Cong Wang --- diff --git a/arch/um/kernel/skas/uaccess.c b/arch/um/kernel/skas/uaccess.c index 9fefd924fb49..cd7df79c6a56 100644 --- a/arch/um/kernel/skas/uaccess.c +++ b/arch/um/kernel/skas/uaccess.c @@ -69,7 +69,7 @@ static int do_op_one_page(unsigned long addr, int len, int is_write, return -1; page = pte_page(*pte); - addr = (unsigned long) kmap_atomic(page, KM_UML_USERCOPY) + + addr = (unsigned long) kmap_atomic(page) + (addr & ~PAGE_MASK); current->thread.fault_catcher = &buf; @@ -82,7 +82,7 @@ static int do_op_one_page(unsigned long addr, int len, int is_write, current->thread.fault_catcher = NULL; - kunmap_atomic((void *)addr, KM_UML_USERCOPY); + kunmap_atomic((void *)addr); return n; }