diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-03-30 08:47:19 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-03-30 08:50:06 +0200 |
| commit | 186e54cbe1145f4d11e32fe10e7e20a11f1b27dd (patch) | |
| tree | 9b6cf3667a3ea90e0cec0ea7119688ba76c55a71 /arch/x86/kvm/cpuid.c | |
| parent | 99dd5497e5be4fe4194cad181d45fd6569a930db (diff) | |
| parent | 4bde23f8751f388867766b0a62ed1ef8b7e01561 (diff) | |
| download | op-kernel-dev-186e54cbe1145f4d11e32fe10e7e20a11f1b27dd.zip op-kernel-dev-186e54cbe1145f4d11e32fe10e7e20a11f1b27dd.tar.gz | |
Merge branch 'linus' into x86/urgent
Merge reason: Needed for include file dependencies.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kvm/cpuid.c')
| -rw-r--r-- | arch/x86/kvm/cpuid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 89b02bf..9fed5be 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -236,7 +236,7 @@ static int do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, const u32 kvm_supported_word6_x86_features = F(LAHF_LM) | F(CMP_LEGACY) | 0 /*SVM*/ | 0 /* ExtApicSpace */ | F(CR8_LEGACY) | F(ABM) | F(SSE4A) | F(MISALIGNSSE) | - F(3DNOWPREFETCH) | 0 /* OSVW */ | 0 /* IBS */ | F(XOP) | + F(3DNOWPREFETCH) | F(OSVW) | 0 /* IBS */ | F(XOP) | 0 /* SKINIT, WDT, LWP */ | F(FMA4) | F(TBM); /* cpuid 0xC0000001.edx */ |
