after fixing conflict between
0902a9044 "Driver core: Use generic offline/online
for CPU offline/online"
and
1c4e2d70a "cpu: make sure that cpu/online file created
before KOBJ_ADD is emitted"
there was left some not needed remnants of the last
commit, remove them since the first commit does the
same thing in another way.
Signed-off-by: Igor Mammedov <imammedo@xxxxxxxxxx>
---
PS:
Alernative way is just to drop 1c4e2d70a if rebase of tree
is acceptable.
---
drivers/base/cpu.c | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index ff97614..130ba0b 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -169,13 +169,6 @@ static const struct attribute_group *common_cpu_attr_groups[] = {
NULL
};
-static const struct attribute_group *hotplugable_cpu_attr_groups[] = {
-#ifdef CONFIG_KEXEC
- &crash_note_cpu_attr_group,
-#endif
- NULL
-};
-
/*
* Print cpu online, possible, present, and system maps
*/
@@ -292,8 +285,6 @@ int __cpuinit register_cpu(struct cpu *cpu, int num)
cpu->dev.bus->uevent = arch_cpu_uevent;
#endif
cpu->dev.groups = common_cpu_attr_groups;
- if (cpu->hotpluggable)
- cpu->dev.groups = hotplugable_cpu_attr_groups;
error = device_register(&cpu->dev);
if (!error)
per_cpu(cpu_sys_devices, num) = &cpu->dev;
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
