Merge tag 'v3.10.92'

[firefly-linux-kernel-4.4.55.git] / arch / x86 / kvm / svm.c

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 3deddd796f769ed647d63d44305f70a6411af36d..5aca045768b23e42e7f5400fd1a109d070dc7bcf 100644 (file)
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -608,7 +608,7 @@ static int has_svm(void)
        return 1;
 }
 
-static void svm_hardware_disable(void *garbage)
+static void svm_hardware_disable(void)
 {
        /* Make sure we clean up behind us */
        if (static_cpu_has(X86_FEATURE_TSCRATEMSR))
@@ -619,7 +619,7 @@ static void svm_hardware_disable(void *garbage)
        amd_pmu_disable_virt();
 }
 
-static int svm_hardware_enable(void *garbage)
+static int svm_hardware_enable(void)
 {
 
        struct svm_cpu_data *sd;