diff --git a/[refs] b/[refs] index 579d88c0e379..33835f233c50 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e9d619d2aa28b71d547edfa15c66d6ab9a3a39c +refs/heads/master: bfc733a7a32612fe213a7492c385f2b03f592d7f diff --git a/trunk/drivers/kvm/svm.c b/trunk/drivers/kvm/svm.c index 827bc2774e73..7beaff1789b1 100644 --- a/trunk/drivers/kvm/svm.c +++ b/trunk/drivers/kvm/svm.c @@ -359,8 +359,8 @@ static int svm_cpu_init(int cpu) } -static int set_msr_interception(u32 *msrpm, unsigned msr, - int read, int write) +static void set_msr_interception(u32 *msrpm, unsigned msr, + int read, int write) { int i; @@ -375,11 +375,10 @@ static int set_msr_interception(u32 *msrpm, unsigned msr, u32 mask = ((write) ? 0 : 2) | ((read) ? 0 : 1); *base = (*base & ~(0x3 << msr_shift)) | (mask << msr_shift); - return 1; + return; } } - printk(KERN_DEBUG "%s: not found 0x%x\n", __FUNCTION__, msr); - return 0; + BUG(); } static __init int svm_hardware_setup(void)