Skip to content

Commit 5b00b50

Browse files
jgross1David Vrabel
authored andcommitted
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 <[email protected]> Signed-off-by: David Vrabel <[email protected]>
1 parent e1c105a commit 5b00b50

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/xen/sys-hypervisor.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ static const struct attribute_group xen_compilation_group = {
215215
.attrs = xen_compile_attrs,
216216
};
217217

218-
static int __init xen_compilation_init(void)
218+
static int __init xen_sysfs_compilation_init(void)
219219
{
220220
return sysfs_create_group(hypervisor_kobj, &xen_compilation_group);
221221
}
@@ -341,7 +341,7 @@ static const struct attribute_group xen_properties_group = {
341341
.attrs = xen_properties_attrs,
342342
};
343343

344-
static int __init xen_properties_init(void)
344+
static int __init xen_sysfs_properties_init(void)
345345
{
346346
return sysfs_create_group(hypervisor_kobj, &xen_properties_group);
347347
}
@@ -455,7 +455,7 @@ static const struct attribute_group xen_pmu_group = {
455455
.attrs = xen_pmu_attrs,
456456
};
457457

458-
static int __init xen_pmu_init(void)
458+
static int __init xen_sysfs_pmu_init(void)
459459
{
460460
return sysfs_create_group(hypervisor_kobj, &xen_pmu_group);
461461
}
@@ -474,18 +474,18 @@ static int __init hyper_sysfs_init(void)
474474
ret = xen_sysfs_version_init();
475475
if (ret)
476476
goto version_out;
477-
ret = xen_compilation_init();
477+
ret = xen_sysfs_compilation_init();
478478
if (ret)
479479
goto comp_out;
480480
ret = xen_sysfs_uuid_init();
481481
if (ret)
482482
goto uuid_out;
483-
ret = xen_properties_init();
483+
ret = xen_sysfs_properties_init();
484484
if (ret)
485485
goto prop_out;
486486
#ifdef CONFIG_XEN_HAVE_VPMU
487487
if (xen_initial_domain()) {
488-
ret = xen_pmu_init();
488+
ret = xen_sysfs_pmu_init();
489489
if (ret) {
490490
sysfs_remove_group(hypervisor_kobj,
491491
&xen_properties_group);

0 commit comments

Comments
 (0)