Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / arch / x86 / kvm / pmu.c

diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c
index d5e6d5b3f06fd77af13d69192ecf6c5d4128d78f..bcc6a73d6628781809f781abfc0b372450af7106 100644 (file)
--- a/arch/x86/kvm/pmu.c
+++ b/arch/x86/kvm/pmu.c
@@ -508,8 +508,8 @@ int kvm_vm_ioctl_set_pmu_event_filter(struct kvm *kvm, void __user *argp)
        *filter = tmp;
 
        mutex_lock(&kvm->lock);
-       rcu_swap_protected(kvm->arch.pmu_event_filter, filter,
-                          mutex_is_locked(&kvm->lock));
+       filter = rcu_replace_pointer(kvm->arch.pmu_event_filter, filter,
+                                    mutex_is_locked(&kvm->lock));
        mutex_unlock(&kvm->lock);
 
        synchronize_srcu_expedited(&kvm->srcu);