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

From	Juergen Gross <jgross@suse.com>
Newsgroups	linux.kernel
Subject	[PATCH] xen: rename xen_pmu_init() in sys-hypervisor.c
Date	2016-08-01 13:50 +0200
Message-ID	<s1jTk-5Ms-17@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] xen: rename xen_pmu_init() in sys-hypervisor.c Juergen Gross <jgross@suse.com> - 2016-08-01 13:50 +0200
  Re: [PATCH] xen: rename xen_pmu_init() in sys-hypervisor.c Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2016-08-01 16:20 +0200
    Re: [PATCH] xen: rename xen_pmu_init() in sys-hypervisor.c Juergen Gross <jgross@suse.com> - 2016-08-01 17:50 +0200
      Re: [PATCH] xen: rename xen_pmu_init() in sys-hypervisor.c Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2016-08-01 17:50 +0200
        Re: [PATCH] xen: rename xen_pmu_init() in sys-hypervisor.c Juergen Gross <jgross@suse.com> - 2016-08-01 19:10 +0200

csiph-web