diff options
| author | Alexander Graf <agraf@suse.de> | 2008-11-25 20:17:02 +0100 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-03-24 10:02:46 +0100 |
| commit | 9962d032bbff0268f22068787831405f8468c8b4 (patch) | |
| tree | 3a9cd94334d419097923c5c4140770c17aa06cc8 /arch/x86/include/asm/virtext.h | |
| parent | KVM: SVM: Clean up VINTR setting (diff) | |
| download | linux-9962d032bbff0268f22068787831405f8468c8b4.tar.xz linux-9962d032bbff0268f22068787831405f8468c8b4.zip | |
KVM: SVM: Move EFER and MSR constants to generic x86 code
MSR_EFER_SVME_MASK, MSR_VM_CR and MSR_VM_HSAVE_PA are set in KVM
specific headers. Linux does have nice header files to collect
EFER bits and MSR IDs, so IMHO we should put them there.
While at it, I also changed the naming scheme to match that
of the other defines.
(introduced in v6)
Acked-by: Joerg Roedel <joro@8bytes.org>
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/include/asm/virtext.h')
| -rw-r--r-- | arch/x86/include/asm/virtext.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/virtext.h b/arch/x86/include/asm/virtext.h index 593636275238..e0f9aa16358b 100644 --- a/arch/x86/include/asm/virtext.h +++ b/arch/x86/include/asm/virtext.h @@ -118,7 +118,7 @@ static inline void cpu_svm_disable(void) wrmsrl(MSR_VM_HSAVE_PA, 0); rdmsrl(MSR_EFER, efer); - wrmsrl(MSR_EFER, efer & ~MSR_EFER_SVME_MASK); + wrmsrl(MSR_EFER, efer & ~EFER_SVME); } /** Makes sure SVM is disabled, if it is supported on the CPU |