diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-02 11:26:36 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-02 11:26:36 -0400 |
| commit | 0dea7c12fc2c15de8b2104a322a1f47919d753fd (patch) | |
| tree | f6f2082164d3a1fcfe3359d02beb6f19917d4c08 /drivers/vhost/vhost.c | |
| parent | ab95bfe01f9872459c8678572ccadbf646badad0 (diff) | |
| parent | f8322fbe049687d3676690e8ad839c7169dd306a (diff) | |
Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Diffstat (limited to 'drivers/vhost/vhost.c')
| -rw-r--r-- | drivers/vhost/vhost.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 3b83382e06eb..04344b711c56 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c | |||
| @@ -237,8 +237,8 @@ static int vq_memory_access_ok(void __user *log_base, struct vhost_memory *mem, | |||
| 237 | { | 237 | { |
| 238 | int i; | 238 | int i; |
| 239 | 239 | ||
| 240 | if (!mem) | 240 | if (!mem) |
| 241 | return 0; | 241 | return 0; |
| 242 | 242 | ||
| 243 | for (i = 0; i < mem->nregions; ++i) { | 243 | for (i = 0; i < mem->nregions; ++i) { |
| 244 | struct vhost_memory_region *m = mem->regions + i; | 244 | struct vhost_memory_region *m = mem->regions + i; |