[PATCH] xen: rename xen_pmu_init() in sys-hypervisor.c

[PATCH] xen: rename xen_pmu_init() in sys-hypervisor.c

[Juergen Gross]

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 <jgross@suse.com>
---
 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);
-- 
2.6.6

Re: [PATCH] xen: rename xen_pmu_init() in sys-hypervisor.c

[Boris Ostrovsky]

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 <jgross@suse.com>

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);

Re: [PATCH] xen: rename xen_pmu_init() in sys-hypervisor.c

[Juergen Gross]

On 01/08/16 16:10, Boris Ostrovsky wrote:
> 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 <jgross@suse.com>
> 
> While at it, how about changing xen_properties_init to
> xen_sysfs_properties_init as well for consistency?

I don't mind changing this name, too. Will send V2.


Juergen

Re: [PATCH] xen: rename xen_pmu_init() in sys-hypervisor.c

[Boris Ostrovsky]

On 08/01/2016 11:44 AM, Juergen Gross wrote:
> On 01/08/16 16:10, Boris Ostrovsky wrote:
>> 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 <jgross@suse.com>
>> While at it, how about changing xen_properties_init to
>> xen_sysfs_properties_init as well for consistency?
> I don't mind changing this name, too. Will send V2.

Thanks. Actually, there is one more --- xen_compilation_init().

-boris

Re: [PATCH] xen: rename xen_pmu_init() in sys-hypervisor.c

[Juergen Gross]

On 01/08/16 17:46, Boris Ostrovsky wrote:
> On 08/01/2016 11:44 AM, Juergen Gross wrote:
>> On 01/08/16 16:10, Boris Ostrovsky wrote:
>>> 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 <jgross@suse.com>
>>> While at it, how about changing xen_properties_init to
>>> xen_sysfs_properties_init as well for consistency?
>> I don't mind changing this name, too. Will send V2.
> 
> Thanks. Actually, there is one more --- xen_compilation_init().

I'll do all of them.


Juergen