diff options
| author | Cong Wang <amwang@redhat.com> | 2011-11-25 16:14:17 +0100 |
|---|---|---|
| committer | Cong Wang <xiyou.wangcong@gmail.com> | 2012-03-20 14:48:15 +0100 |
| commit | 91f2359396d87f24ea43d91ff77dec54847ad69a (patch) | |
| tree | 75422aa4bd39927e4b448407fc3ccd83fb4f5e96 | |
| parent | sh: remove the second argument of k[un]map_atomic() (diff) | |
| download | linux-91f2359396d87f24ea43d91ff77dec54847ad69a.tar.xz linux-91f2359396d87f24ea43d91ff77dec54847ad69a.zip | |
um: remove the second argument of k[un]map_atomic()
Signed-off-by: Cong Wang <amwang@redhat.com>
| -rw-r--r-- | arch/um/kernel/skas/uaccess.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |