From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751807AbcHAOK6 (ORCPT ); Mon, 1 Aug 2016 10:10:58 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:41393 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750817AbcHAOKv (ORCPT ); Mon, 1 Aug 2016 10:10:51 -0400 Subject: Re: [PATCH] xen: rename xen_pmu_init() in sys-hypervisor.c To: Juergen Gross , linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org References: <1470051608-17080-1-git-send-email-jgross@suse.com> Cc: david.vrabel@citrix.com From: Boris Ostrovsky Message-ID: <60e0cea0-cb2d-8398-49bc-fa06720453b7@oracle.com> Date: Mon, 1 Aug 2016 10:10:24 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <1470051608-17080-1-git-send-email-jgross@suse.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 08/01/2016 07:40 AM, Juergen Gross wrote: > There are two functions with name xen_pmu_init() in the kernel. Rename > the one in drivers/xen/sys-hypervisor.c to avoid shadowing the one in > arch/x86/xen/pmu.c > > Signed-off-by: Juergen Gross While at it, how about changing xen_properties_init to xen_sysfs_properties_init as well for consistency? -boris > --- > drivers/xen/sys-hypervisor.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/xen/sys-hypervisor.c b/drivers/xen/sys-hypervisor.c > index 6881b3c..17ea846 100644 > --- a/drivers/xen/sys-hypervisor.c > +++ b/drivers/xen/sys-hypervisor.c > @@ -455,7 +455,7 @@ static const struct attribute_group xen_pmu_group = { > .attrs = xen_pmu_attrs, > }; > > -static int __init xen_pmu_init(void) > +static int __init xen_sysfs_pmu_init(void) > { > return sysfs_create_group(hypervisor_kobj, &xen_pmu_group); > } > @@ -485,7 +485,7 @@ static int __init hyper_sysfs_init(void) > goto prop_out; > #ifdef CONFIG_XEN_HAVE_VPMU > if (xen_initial_domain()) { > - ret = xen_pmu_init(); > + ret = xen_sysfs_pmu_init(); > if (ret) { > sysfs_remove_group(hypervisor_kobj, > &xen_properties_group);