[PATCH 4/7,v10] NUMA Hotplug Emulator: Abstract cpu registerfunctions

[Zhang, Yang Z]

From: Shaohui Zheng <shaohui.zheng@xxxxxxxxx>

Abstract cpu register functions, provide a more flexible interface
register_cpu_node, the new interface provides convenience to add cpu
to a specified node, we can use it to add a cpu to a fake node.

Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
Signed-off-by: Shaohui Zheng <shaohui.zheng@xxxxxxxxx>
Signed-off-by: Yang Zhang <yang.z.zhang@xxxxxxxxx>
---
 arch/x86/include/asm/cpu.h |    1 +
 arch/x86/kernel/topology.c |    9 +++++++++
 drivers/base/cpu.c         |    9 +++++----
 include/linux/cpu.h        |    8 +++++++-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/arch/x86/include/asm/cpu.h linux-hpe4/arch/x86/include/asm/cpu.h
index 4564c8e..cbb062f 100644
--- a/arch/x86/include/asm/cpu.h
+++ linux-hpe4/arch/x86/include/asm/cpu.h
@@ -27,6 +27,7 @@ struct x86_cpu {

 #ifdef CONFIG_HOTPLUG_CPU
 extern int arch_register_cpu(int num);
+extern int arch_register_cpu_node(int num, int nid);
 extern void arch_unregister_cpu(int);
 #endif

diff --git a/arch/x86/kernel/topology.c linux-hpe4/arch/x86/kernel/topology.c
index 7e45159..1e53227 100644
--- a/arch/x86/kernel/topology.c
+++ linux-hpe4/arch/x86/kernel/topology.c
@@ -52,6 +52,15 @@ int __ref arch_register_cpu(int num)
 }
 EXPORT_SYMBOL(arch_register_cpu);

+int __ref arch_register_cpu_node(int num, int nid)
+{
+       if (num)
+               per_cpu(cpu_devices, num).cpu.hotpluggable = 1;
+
+       return register_cpu_node(&per_cpu(cpu_devices, num).cpu, num, nid);
+}
+EXPORT_SYMBOL(arch_register_cpu_node);
+
 void arch_unregister_cpu(int num)
 {
        unregister_cpu(&per_cpu(cpu_devices, num).cpu);
diff --git a/drivers/base/cpu.c linux-hpe4/drivers/base/cpu.c
index 251acea..6b791ae 100644
--- a/drivers/base/cpu.c
+++ linux-hpe4/drivers/base/cpu.c
@@ -208,17 +208,18 @@ static ssize_t print_cpus_offline(struct sysdev_class *class,
 static SYSDEV_CLASS_ATTR(offline, 0444, print_cpus_offline, NULL);

 /*
- * register_cpu - Setup a sysfs device for a CPU.
+ * register_cpu_node - Setup a sysfs device for a CPU.
  * @cpu - cpu->hotpluggable field set to 1 will generate a control file in
  *       sysfs for this CPU.
  * @num - CPU number to use when creating the device.
+ * @nid - Node ID to use, if any.
  *
  * Initialize and register the CPU device.
  */
-int __cpuinit register_cpu(struct cpu *cpu, int num)
+int __cpuinit register_cpu_node(struct cpu *cpu, int num, int nid)
 {
        int error;
-       cpu->node_id = cpu_to_node(num);
+       cpu->node_id = nid;
        cpu->sysdev.id = num;
        cpu->sysdev.cls = &cpu_sysdev_class;

@@ -229,7 +230,7 @@ int __cpuinit register_cpu(struct cpu *cpu, int num)
        if (!error)
                per_cpu(cpu_sys_devices, num) = &cpu->sysdev;
        if (!error)
-               register_cpu_under_node(num, cpu_to_node(num));
+               register_cpu_under_node(num, nid);

 #ifdef CONFIG_KEXEC
        if (!error)
diff --git a/include/linux/cpu.h linux-hpe4/include/linux/cpu.h
index 5f09323..014856d 100644
--- a/include/linux/cpu.h
+++ linux-hpe4/include/linux/cpu.h
@@ -25,7 +25,13 @@ struct cpu {
        struct sys_device sysdev;
 };

-extern int register_cpu(struct cpu *cpu, int num);
+extern int register_cpu_node(struct cpu *cpu, int num, int nid);
+
+static inline int register_cpu(struct cpu *cpu, int num)
+{
+       return register_cpu_node(cpu, num, cpu_to_node(num));
+}
+
 extern struct sys_device *get_cpu_sysdev(unsigned cpu);

 extern int cpu_add_sysdev_attr(struct sysdev_attribute *attr);
--
1.7.1.1
--
best regards
yang


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/