Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

KVM: Use standard CR8 flags, and fix TPR definition

Browse source 
Intel manual (and KVM definition) say the TPR is 4 bits wide.  Also fix
CR8_RESEVED_BITS typo.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
This commit is contained in:
Rusty Russell 2007-07-17 23:37:17 +10:00 committed by Avi Kivity
parent 8fc0d085f5
commit 7075bc816c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/kvm/kvm_main.c
View file

@ -92,7 +92,7 @@ static struct dentry *debugfs_dir;
| X86_CR4_PGE | X86_CR4_PCE | X86_CR4_OSFXSR \ | X86_CR4_PGE | X86_CR4_PCE | X86_CR4_OSFXSR \
| X86_CR4_OSXMMEXCPT | X86_CR4_VMXE)) | X86_CR4_OSXMMEXCPT | X86_CR4_VMXE))
#define CR8_RESEVED_BITS (~0x0fULL) #define CR8_RESERVED_BITS (~(unsigned long)X86_CR8_TPR)
#define EFER_RESERVED_BITS 0xfffffffffffff2fe #define EFER_RESERVED_BITS 0xfffffffffffff2fe
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
@ -625,7 +625,7 @@ EXPORT_SYMBOL_GPL(set_cr3);
void set_cr8(struct kvm_vcpu *vcpu, unsigned long cr8) void set_cr8(struct kvm_vcpu *vcpu, unsigned long cr8)
{ {
if ( cr8 & CR8_RESEVED_BITS) { if (cr8 & CR8_RESERVED_BITS) {
printk(KERN_DEBUG "set_cr8: #GP, reserved bits 0x%lx\n", cr8); printk(KERN_DEBUG "set_cr8: #GP, reserved bits 0x%lx\n", cr8);
inject_gp(vcpu); inject_gp(vcpu);
return; return;

2
include/asm-x86/processor-flags.h
View file

@ -63,7 +63,7 @@
/* /*
* x86-64 Task Priority Register, CR8 * x86-64 Task Priority Register, CR8
*/ */
#define X86_CR8_TPR 0x00000007 /* task priority register */ #define X86_CR8_TPR 0x0000000F /* task priority register */
/* /*
* AMD and Transmeta use MSRs for configuration; see <asm/msr-index.h> * AMD and Transmeta use MSRs for configuration; see <asm/msr-index.h>