diff options
author | Arnd Bergmann | 2012-03-19 21:46:32 +0100 |
---|---|---|
committer | Arnd Bergmann | 2012-03-20 10:41:43 +0100 |
commit | b2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc (patch) | |
tree | 065282434bde6ef9b4357c042705c5fcef3782ea /arch/x86/kvm/svm.c | |
parent | Merge branch 'local_timers-for-arm-soc' of git://git.kernel.org/pub/scm/linux... (diff) | |
parent | Merge branch 'renesas/fixes' into renesas/soc (diff) | |
download | kernel-qcow2-linux-b2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc.tar.gz kernel-qcow2-linux-b2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc.tar.xz kernel-qcow2-linux-b2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc.zip |
Merge branch 'renesas/timer' into next/timer
Conflicts:
arch/arm/mach-shmobile/timer.c
This resolves a nonobvious merge conflict between renesas
timer changes in the global timer changes with those
from the renesas soc branch and last minute bug fixes that
went into v3.3.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/x86/kvm/svm.c')
-rw-r--r-- | arch/x86/kvm/svm.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 5fa553babe56..e385214711cb 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -29,6 +29,7 @@ #include <linux/ftrace_event.h> #include <linux/slab.h> +#include <asm/perf_event.h> #include <asm/tlbflush.h> #include <asm/desc.h> #include <asm/kvm_para.h> @@ -575,6 +576,8 @@ static void svm_hardware_disable(void *garbage) wrmsrl(MSR_AMD64_TSC_RATIO, TSC_RATIO_DEFAULT); cpu_svm_disable(); + + amd_pmu_disable_virt(); } static int svm_hardware_enable(void *garbage) @@ -622,6 +625,8 @@ static int svm_hardware_enable(void *garbage) svm_init_erratum_383(); + amd_pmu_enable_virt(); + return 0; } |