mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/arch/ia64/kernel/topology.c
..
..
@@ -19,7 +19,7 @@
19
19
 #include <linux/node.h>
20
20
 #include <linux/slab.h>
21
21
 #include <linux/init.h>
22
-#include <linux/bootmem.h>
22
+#include <linux/memblock.h>
23
23
 #include <linux/nodemask.h>
24
24
 #include <linux/notifier.h>
25
25
 #include <linux/export.h>
..
..
@@ -42,7 +42,6 @@
42
42
 #ifdef CONFIG_HOTPLUG_CPU
43
43
 int __ref arch_register_cpu(int num)
44
44
 {
45
-#ifdef CONFIG_ACPI
46
45
 	/*
47
46
 	 * If CPEI can be re-targeted or if this is not
48
47
 	 * CPEI target, then it is hotpluggable
..
..
@@ -50,7 +49,6 @@
50
49
 	if (can_cpei_retarget() || !is_cpu_cpei_target(num))
51
50
 		sysfs_cpus[num].cpu.hotpluggable = 1;
52
51
 	map_cpu_to_node(num, node_cpuid[num].nid);
53
-#endif
54
52
 	return register_cpu(&sysfs_cpus[num].cpu, num);
55
53
 }
56
54
 EXPORT_SYMBOL(arch_register_cpu);
..
..
@@ -58,9 +56,7 @@
58
56
 void __ref arch_unregister_cpu(int num)
59
57
 {
60
58
 	unregister_cpu(&sysfs_cpus[num].cpu);
61
-#ifdef CONFIG_ACPI
62
59
 	unmap_cpu_from_node(num, cpu_to_node(num));
63
-#endif
64
60
 }
65
61
 EXPORT_SYMBOL(arch_unregister_cpu);
66
62
 #else