diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-26 12:06:42 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-26 12:06:42 +1000 |
| commit | 50f6ac54d43e4b626a33ac4577d9b4614b9601c2 (patch) | |
| tree | b07153507e62055da69b79394b532eb6d29ac896 /virt | |
| parent | 4c5a42519abb67df3bb547400957491e6e612fe6 (diff) | |
| parent | 1e8c3fdac4486ee8dbc67e89df34328be1b724b3 (diff) | |
Merge branch 'quilt/rr'
Conflicts:
kernel/cpu.c
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/kvm_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 09057b71f125..169f6c5ad2a4 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -738,8 +738,7 @@ static bool make_all_cpus_request(struct kvm *kvm, unsigned int req) bool called = true; struct kvm_vcpu *vcpu; - if (alloc_cpumask_var(&cpus, GFP_ATOMIC)) - cpumask_clear(cpus); + zalloc_cpumask_var(&cpus, GFP_ATOMIC); me = get_cpu(); spin_lock(&kvm->requests_lock); |