diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-12-17 08:48:27 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-12-17 08:48:27 -0800 |
| commit | d3d3a134d75d28034b950bc0b6682ba0be976f37 (patch) | |
| tree | 71365703ae44c980a80f9b2c02d664cbc3ddd935 /arch/x86/kvm/svm.c | |
| parent | a143f427f3e7c6d80bc1d288334706a1f8237f5f (diff) | |
| parent | 8b20b3796da06d8ada347c4eaf289c3127da155f (diff) | |
Merge branch 'v4.1/topic/rt' into linux-linaro-lsk-v4.1-rt
Diffstat (limited to 'arch/x86/kvm/svm.c')
| -rw-r--r-- | arch/x86/kvm/svm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 4911bf19122b..7858cd9acfe4 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -512,7 +512,7 @@ static void skip_emulated_instruction(struct kvm_vcpu *vcpu) struct vcpu_svm *svm = to_svm(vcpu); if (svm->vmcb->control.next_rip != 0) { - WARN_ON(!static_cpu_has(X86_FEATURE_NRIPS)); + WARN_ON_ONCE(!static_cpu_has(X86_FEATURE_NRIPS)); svm->next_rip = svm->vmcb->control.next_rip; } |