diff --git a/[refs] b/[refs] index c661ee08709f..cf264faf28ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57efd44c8cad440fb00ef8078cb018ab2f221373 +refs/heads/master: d7ffde35e31a81100d2d0d2c4013cbf527bb32ea diff --git a/trunk/drivers/vhost/vhost.c b/trunk/drivers/vhost/vhost.c index 94dbd25caa30..112156f68afb 100644 --- a/trunk/drivers/vhost/vhost.c +++ b/trunk/drivers/vhost/vhost.c @@ -191,7 +191,9 @@ static int vhost_worker(void *data) struct vhost_dev *dev = data; struct vhost_work *work = NULL; unsigned uninitialized_var(seq); + mm_segment_t oldfs = get_fs(); + set_fs(USER_DS); use_mm(dev->mm); for (;;) { @@ -229,6 +231,7 @@ static int vhost_worker(void *data) } unuse_mm(dev->mm); + set_fs(oldfs); return 0; }