diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-02 17:24:59 (GMT) |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-02 17:24:59 (GMT) |
commit | 744c62eb65a1c3bb2196ded1a1d2922cf6f2ce80 (patch) | |
tree | e7c47e2e9aa8f6184cb5b20bde2e4fda96a3bb59 /drivers/vhost | |
parent | f141822b15635daa94610c5527806fa315f59f4d (diff) | |
parent | 6887a4131da3adaab011613776d865f4bcfb5678 (diff) | |
download | linux-fsl-qoriq-744c62eb65a1c3bb2196ded1a1d2922cf6f2ce80.tar.xz |
Merge tag 'v3.5-rc5' into regulator-drivers
Linux 3.5-rc5 collides with further development.
Conflicts:
drivers/regulator/tps65023-regulator.c
Diffstat (limited to 'drivers/vhost')
-rw-r--r-- | drivers/vhost/vhost.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 94dbd25..112156f 100644 --- a/drivers/vhost/vhost.c +++ b/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; } |