projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'tegra-for-4.8-i2c' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra...
[cascardo/linux.git]
/
drivers
/
xen
/
sys-hypervisor.c
diff --git
a/drivers/xen/sys-hypervisor.c
b/drivers/xen/sys-hypervisor.c
index
6881b3c
..
84106f9
100644
(file)
--- 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,
};
.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();
if (ret)
goto version_out;
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;
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()) {
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);
if (ret) {
sysfs_remove_group(hypervisor_kobj,
&xen_properties_group);