diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-03-27 05:57:26 +0400 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-03-27 05:57:26 +0400 |
| commit | fc2ed77b9d6b579d61024163c74f41c24394fcc7 (patch) | |
| tree | 903d80ba1b1fc0eb15e122a8c12a72f72e7ed2de /arch/x86/lib | |
| parent | 3d04d42312eacc68fbcddea337f7eb34bc035dfb (diff) | |
| parent | 50269e19ad990e79eeda101fc6df80cffd5d4831 (diff) | |
| download | linux-fc2ed77b9d6b579d61024163c74f41c24394fcc7.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/x86/lib')
| -rw-r--r-- | arch/x86/lib/usercopy_32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c index e218d5df85ff..d9b094ca7aaa 100644 --- a/arch/x86/lib/usercopy_32.c +++ b/arch/x86/lib/usercopy_32.c @@ -760,9 +760,9 @@ survive: break; } - maddr = kmap_atomic(pg, KM_USER0); + maddr = kmap_atomic(pg); memcpy(maddr + offset, from, len); - kunmap_atomic(maddr, KM_USER0); + kunmap_atomic(maddr); set_page_dirty_lock(pg); put_page(pg); up_read(¤t->mm->mmap_sem); |