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

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>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
OraBug: 25497392

(cherry picked from commit 5b00b504b13b2f0d1aa73d59cf8984726f19100f)
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>

diff --git a/drivers/xen/sys-hypervisor.c b/drivers/xen/sys-hypervisor.c
index b5a7342e0ba5288ddf9e4e3f4fcd4fbcced9df9e..2f3e7e7a80d0a0d81b180f52e039e32e33d2cd60 100644 (file)
--- a/drivers/xen/sys-hypervisor.c
+++ b/drivers/xen/sys-hypervisor.c
@@ -230,7 +230,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);
 }
@@ -361,7 +361,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);
 }
@@ -480,7 +480,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);
 }
@@ -504,18 +504,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) {
                        xen_properties_destroy();
                        goto prop_out;