Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[firefly-linux-kernel-4.4.55.git] / arch / x86 / kernel / kvm.c

diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
index f0c6fd6f176b00c9c3fdd972104c1961319f5eb9..694d801bf606736fb5b54a74b225fa229c7f5ac4 100644 (file)
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@ -438,9 +438,9 @@ void __init kvm_guest_init(void)
 static __init int activate_jump_labels(void)
 {
        if (has_steal_clock) {
-               jump_label_inc(&paravirt_steal_enabled);
+               static_key_slow_inc(&paravirt_steal_enabled);
                if (steal_acc)
-                       jump_label_inc(&paravirt_steal_rq_enabled);
+                       static_key_slow_inc(&paravirt_steal_rq_enabled);
        }
 
        return 0;