diff options
Diffstat (limited to 'arch/powerpc/kvm/book3s_hv_builtin.c')
-rw-r--r-- | arch/powerpc/kvm/book3s_hv_builtin.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/powerpc/kvm/book3s_hv_builtin.c b/arch/powerpc/kvm/book3s_hv_builtin.c index bed1279aa6a..e1b60f56f2a 100644 --- a/arch/powerpc/kvm/book3s_hv_builtin.c +++ b/arch/powerpc/kvm/book3s_hv_builtin.c | |||
@@ -173,9 +173,9 @@ static void __init kvm_linear_init_one(ulong size, int count, int type) | |||
173 | 173 | ||
174 | static struct kvmppc_linear_info *kvm_alloc_linear(int type) | 174 | static struct kvmppc_linear_info *kvm_alloc_linear(int type) |
175 | { | 175 | { |
176 | struct kvmppc_linear_info *ri; | 176 | struct kvmppc_linear_info *ri, *ret; |
177 | 177 | ||
178 | ri = NULL; | 178 | ret = NULL; |
179 | spin_lock(&linear_lock); | 179 | spin_lock(&linear_lock); |
180 | list_for_each_entry(ri, &free_linears, list) { | 180 | list_for_each_entry(ri, &free_linears, list) { |
181 | if (ri->type != type) | 181 | if (ri->type != type) |
@@ -183,11 +183,12 @@ static struct kvmppc_linear_info *kvm_alloc_linear(int type) | |||
183 | 183 | ||
184 | list_del(&ri->list); | 184 | list_del(&ri->list); |
185 | atomic_inc(&ri->use_count); | 185 | atomic_inc(&ri->use_count); |
186 | memset(ri->base_virt, 0, ri->npages << PAGE_SHIFT); | ||
187 | ret = ri; | ||
186 | break; | 188 | break; |
187 | } | 189 | } |
188 | spin_unlock(&linear_lock); | 190 | spin_unlock(&linear_lock); |
189 | memset(ri->base_virt, 0, ri->npages << PAGE_SHIFT); | 191 | return ret; |
190 | return ri; | ||
191 | } | 192 | } |
192 | 193 | ||
193 | static void kvm_release_linear(struct kvmppc_linear_info *ri) | 194 | static void kvm_release_linear(struct kvmppc_linear_info *ri) |