* [PATCH v2] xen: rename xen_pmu_init() in sys-hypervisor.c
@ 2016-08-02 6:53 Juergen Gross
2016-08-02 14:09 ` Boris Ostrovsky
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Juergen Gross @ 2016-08-02 6:53 UTC (permalink / raw)
To: linux-kernel, xen-devel; +Cc: boris.ostrovsky, david.vrabel, 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
To avoid the same problem in future rename some more functions.
Signed-off-by: Juergen Gross <jgross@suse.com>
---
V2: rename more *_init() functions as suggested by Boris Ostrovsky
---
drivers/xen/sys-hypervisor.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/xen/sys-hypervisor.c b/drivers/xen/sys-hypervisor.c
index 6881b3c..84106f9 100644
--- a/drivers/xen/sys-hypervisor.c
+++ b/drivers/xen/sys-hypervisor.c
@@ -215,7 +215,7 @@ static const struct attribute_group xen_compilation_group = {
.attrs = xen_compile_attrs,
};
-static int __init xen_compilation_init(void)
+static int __init xen_sysfs_compilation_init(void)
{
return sysfs_create_group(hypervisor_kobj, &xen_compilation_group);
}
@@ -341,7 +341,7 @@ static const struct attribute_group xen_properties_group = {
.attrs = xen_properties_attrs,
};
-static int __init xen_properties_init(void)
+static int __init xen_sysfs_properties_init(void)
{
return sysfs_create_group(hypervisor_kobj, &xen_properties_group);
}
@@ -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);
}
@@ -474,18 +474,18 @@ static int __init hyper_sysfs_init(void)
ret = xen_sysfs_version_init();
if (ret)
goto version_out;
- ret = xen_compilation_init();
+ ret = xen_sysfs_compilation_init();
if (ret)
goto comp_out;
ret = xen_sysfs_uuid_init();
if (ret)
goto uuid_out;
- ret = xen_properties_init();
+ ret = xen_sysfs_properties_init();
if (ret)
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] xen: rename xen_pmu_init() in sys-hypervisor.c
2016-08-02 6:53 [PATCH v2] xen: rename xen_pmu_init() in sys-hypervisor.c Juergen Gross
@ 2016-08-02 14:09 ` Boris Ostrovsky
2016-08-18 6:01 ` Juergen Gross
2016-08-24 17:46 ` [Xen-devel] " David Vrabel
2 siblings, 0 replies; 4+ messages in thread
From: Boris Ostrovsky @ 2016-08-02 14:09 UTC (permalink / raw)
To: Juergen Gross, linux-kernel, xen-devel; +Cc: david.vrabel
On 08/02/2016 02:53 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
>
> To avoid the same problem in future rename some more functions.
>
> Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] xen: rename xen_pmu_init() in sys-hypervisor.c
2016-08-02 6:53 [PATCH v2] xen: rename xen_pmu_init() in sys-hypervisor.c Juergen Gross
2016-08-02 14:09 ` Boris Ostrovsky
@ 2016-08-18 6:01 ` Juergen Gross
2016-08-24 17:46 ` [Xen-devel] " David Vrabel
2 siblings, 0 replies; 4+ messages in thread
From: Juergen Gross @ 2016-08-18 6:01 UTC (permalink / raw)
To: david.vrabel; +Cc: linux-kernel, xen-devel, boris.ostrovsky
On 02/08/16 08:53, 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
>
> To avoid the same problem in future rename some more functions.
>
> Signed-off-by: Juergen Gross <jgross@suse.com>
David, could you take this patch, please?
Juergen
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Xen-devel] [PATCH v2] xen: rename xen_pmu_init() in sys-hypervisor.c
2016-08-02 6:53 [PATCH v2] xen: rename xen_pmu_init() in sys-hypervisor.c Juergen Gross
2016-08-02 14:09 ` Boris Ostrovsky
2016-08-18 6:01 ` Juergen Gross
@ 2016-08-24 17:46 ` David Vrabel
2 siblings, 0 replies; 4+ messages in thread
From: David Vrabel @ 2016-08-24 17:46 UTC (permalink / raw)
To: Juergen Gross, linux-kernel, xen-devel; +Cc: boris.ostrovsky, david.vrabel
On 02/08/16 07:53, 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
>
> To avoid the same problem in future rename some more functions.
Applied to for-linus-4.9, thanks.
David
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-08-24 17:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-02 6:53 [PATCH v2] xen: rename xen_pmu_init() in sys-hypervisor.c Juergen Gross
2016-08-02 14:09 ` Boris Ostrovsky
2016-08-18 6:01 ` Juergen Gross
2016-08-24 17:46 ` [Xen-devel] " David Vrabel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).