diff --git a/[refs] b/[refs] index 04d3c9bc03c8..e75ab92829ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca747d610b765f184e0662088dd9aeecf9a17822 +refs/heads/master: c6daa7ffa834c850b3dbb38af6980415caef680d diff --git a/trunk/drivers/vhost/vhost.c b/trunk/drivers/vhost/vhost.c index c14c42b95ab8..bdb2d6436b2b 100644 --- a/trunk/drivers/vhost/vhost.c +++ b/trunk/drivers/vhost/vhost.c @@ -937,9 +937,9 @@ static int set_bit_to_user(int nr, void __user *addr) if (r < 0) return r; BUG_ON(r != 1); - base = kmap_atomic(page, KM_USER0); + base = kmap_atomic(page); set_bit(bit, base); - kunmap_atomic(base, KM_USER0); + kunmap_atomic(base); set_page_dirty_lock(page); put_page(page); return 0;