diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-08-07 13:53:41 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-08-07 13:53:41 +0200 |
| commit | 6ac7ada210a8d23a56fbf18b6e1e00528844565c (patch) | |
| tree | f62352a9b08e560f41cd4008ec0029b6b026d3a5 /arch/x86/kvm/svm.c | |
| parent | 73851b36fe73819f8c201971e913324d4846a7ea (diff) | |
| parent | d00a9e02178401433fc386e69c936f2039f07b57 (diff) | |
| download | linux-6ac7ada210a8d23a56fbf18b6e1e00528844565c.tar.bz2 | |
Merge tag 'asoc-fix-v4.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.2
There are a couple of small driver specific fixes here but the
overwhelming bulk of these changes are fixes to the topology ABI that
has been newly introduced in v4.2. Once this makes it into a release we
will have to firm this up but for now getting enhancements in before
they've made it into a release is the most expedient thing.
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 bbc678a66b18..8e0c0844c6b9 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -1672,7 +1672,7 @@ static void svm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0) * does not do it - this results in some delay at * reboot */ - if (!(vcpu->kvm->arch.disabled_quirks & KVM_QUIRK_CD_NW_CLEARED)) + if (kvm_check_has_quirk(vcpu->kvm, KVM_X86_QUIRK_CD_NW_CLEARED)) cr0 &= ~(X86_CR0_CD | X86_CR0_NW); svm->vmcb->save.cr0 = cr0; mark_dirty(svm->vmcb, VMCB_CR); |