diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-17 12:28:03 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-17 12:28:03 +1000 |
| commit | c5cac136e1eb4713565618060f214b0f7bdcc7ee (patch) | |
| tree | 1ba2cf526d6ff471b84ecde6d26fee5937544e3e /virt | |
| parent | d5d6ba98a3bb1f3c27c1445d03b1cea66a26025d (diff) | |
| parent | 1edd54f99f316c054a6bf7101c3634aef1226557 (diff) | |
Merge branch 'quilt/rr'
Conflicts:
arch/sh/include/asm/smp.h
drivers/net/sfc/efx.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 8939ffaa82fe..da204b0df337 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -735,8 +735,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(); kvm_for_each_vcpu(i, vcpu, kvm) { |