From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S965378Ab2B1RY4 (ORCPT <rfc822;w@1wt.eu>);
	Tue, 28 Feb 2012 12:24:56 -0500
Received: from mx1.redhat.com ([209.132.183.28]:11609 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S964770Ab2B1RYy (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Tue, 28 Feb 2012 12:24:54 -0500
Message-ID: <4F4D0DD6.9030302@redhat.com>
Date: Tue, 28 Feb 2012 19:24:38 +0200
From: Avi Kivity <avi@redhat.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:9.0) Gecko/20111222 Thunderbird/9.0
MIME-Version: 1.0
To: Joerg Roedel <joerg.roedel@amd.com>
CC: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, joro@8bytes.org,
        Peter Zijlstra <a.p.zijlstra@chello.nl>, Ingo Molnar <mingo@elte.hu>,
        Stephane Eranian <eranian@google.com>, David Ahern <dsahern@gmail.com>,
        Gleb Natapov <gleb@redhat.com>,
        Robert Richter <robert.richter@amd.com>
Subject: Re: [PATCH] perf/x86: Fix HO/GO counting with SVM disabled
References: <20120227182325.GA12302@8bytes.org> <1330444544-15665-1-git-send-email-joerg.roedel@amd.com>
In-Reply-To: <1330444544-15665-1-git-send-email-joerg.roedel@amd.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 02/28/2012 05:55 PM, Joerg Roedel wrote:
>  
>  __init int amd_pmu_init(void)
> diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
> index 5fa553b..773fee2 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();
> +
> +	x86_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();
>  
> +	x86_pmu_enable_virt();
> +
>  	return 0;
>  }
>  

These should go into x86.c.  If the functions later gain meaning on
Intel, we want them to be called (and nothing in the name suggests
they're AMD specific).

-- 
error compiling committee.c: too many arguments to function