openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Juergen Gross 2016-08-02 08:53:36 +02:00 committed by David Vrabel
parent e1c105a9d7
commit 5b00b504b1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/xen/sys-hypervisor.c
View File

@ -215,7 +215,7 @@ static const struct attribute_group xen_compilation_group = {
.attrs = xen_compile_attrs, .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); 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, .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); 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, .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); 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(); ret = xen_sysfs_version_init();
if (ret) if (ret)
goto version_out; goto version_out;
ret = xen_compilation_init(); ret = xen_sysfs_compilation_init();
if (ret) if (ret)
goto comp_out; goto comp_out;
ret = xen_sysfs_uuid_init(); ret = xen_sysfs_uuid_init();
if (ret) if (ret)
goto uuid_out; goto uuid_out;
ret = xen_properties_init(); ret = xen_sysfs_properties_init();
if (ret) if (ret)
goto prop_out; goto prop_out;
#ifdef CONFIG_XEN_HAVE_VPMU #ifdef CONFIG_XEN_HAVE_VPMU
if (xen_initial_domain()) { if (xen_initial_domain()) {
ret = xen_pmu_init(); ret = xen_sysfs_pmu_init();
if (ret) { if (ret) {
sysfs_remove_group(hypervisor_kobj, sysfs_remove_group(hypervisor_kobj,
&xen_properties_group); &xen_properties_group);