From: KAMEZAWA Hiroyuki Modify callers of register_cpu()/unregister_cpu, whose args are changed by register-cpu-remove-node-struct patch. Signed-off-by: KAMEZAWA Hiroyuki Cc: Yasunori Goto Cc: Ashok Raj Cc: Dave Hansen Signed-off-by: Andrew Morton --- arch/arm/kernel/setup.c | 2 +- arch/i386/kernel/topology.c | 23 ++++------------------- arch/ia64/kernel/topology.c | 17 ++--------------- arch/m32r/kernel/setup.c | 2 +- arch/mips/kernel/smp.c | 2 +- arch/parisc/kernel/topology.c | 3 +-- arch/powerpc/kernel/setup_32.c | 2 +- arch/powerpc/kernel/sysfs.c | 10 +--------- arch/ppc/kernel/setup.c | 2 +- arch/s390/kernel/smp.c | 2 +- arch/sh/kernel/setup.c | 2 +- arch/sh64/kernel/setup.c | 2 +- arch/sparc64/kernel/setup.c | 2 +- 13 files changed, 17 insertions(+), 54 deletions(-) diff -puN arch/arm/kernel/setup.c~node-hotplug-fixes-callres-of-register_cpu arch/arm/kernel/setup.c --- 25/arch/arm/kernel/setup.c~node-hotplug-fixes-callres-of-register_cpu Fri May 26 16:03:25 2006 +++ 25-akpm/arch/arm/kernel/setup.c Fri May 26 16:03:25 2006 @@ -838,7 +838,7 @@ static int __init topology_init(void) int cpu; for_each_possible_cpu(cpu) - register_cpu(&per_cpu(cpu_data, cpu).cpu, cpu, NULL); + register_cpu(&per_cpu(cpu_data, cpu).cpu, cpu); return 0; } diff -puN arch/i386/kernel/topology.c~node-hotplug-fixes-callres-of-register_cpu arch/i386/kernel/topology.c --- 25/arch/i386/kernel/topology.c~node-hotplug-fixes-callres-of-register_cpu Fri May 26 16:03:25 2006 +++ 25-akpm/arch/i386/kernel/topology.c Fri May 26 16:03:27 2006 @@ -32,15 +32,8 @@ static struct i386_cpu cpu_devices[NR_CPUS]; -int arch_register_cpu(int num){ - struct node *parent = NULL; - -#ifdef CONFIG_NUMA - int node = cpu_to_node(num); - if (node_online(node)) - parent = &node_devices[parent_node(node)]; -#endif /* CONFIG_NUMA */ - +int arch_register_cpu(int num) +{ /* * CPU0 cannot be offlined due to several * restrictions and assumptions in kernel. This basically @@ -50,21 +43,13 @@ int arch_register_cpu(int num){ if (!num) cpu_devices[num].cpu.no_control = 1; - return register_cpu(&cpu_devices[num].cpu, num, parent); + return register_cpu(&cpu_devices[num].cpu, num); } #ifdef CONFIG_HOTPLUG_CPU void arch_unregister_cpu(int num) { - struct node *parent = NULL; - -#ifdef CONFIG_NUMA - int node = cpu_to_node(num); - if (node_online(node)) - parent = &node_devices[parent_node(node)]; -#endif /* CONFIG_NUMA */ - - return unregister_cpu(&cpu_devices[num].cpu, parent); + return unregister_cpu(&cpu_devices[num].cpu); } EXPORT_SYMBOL(arch_register_cpu); EXPORT_SYMBOL(arch_unregister_cpu); diff -puN arch/ia64/kernel/topology.c~node-hotplug-fixes-callres-of-register_cpu arch/ia64/kernel/topology.c --- 25/arch/ia64/kernel/topology.c~node-hotplug-fixes-callres-of-register_cpu Fri May 26 16:03:25 2006 +++ 25-akpm/arch/ia64/kernel/topology.c Fri May 26 16:03:25 2006 @@ -30,12 +30,6 @@ static struct ia64_cpu *sysfs_cpus; int arch_register_cpu(int num) { - struct node *parent = NULL; - -#ifdef CONFIG_NUMA - parent = &node_devices[cpu_to_node(num)]; -#endif /* CONFIG_NUMA */ - #if defined (CONFIG_ACPI) && defined (CONFIG_HOTPLUG_CPU) /* * If CPEI cannot be re-targetted, and this is @@ -45,21 +39,14 @@ int arch_register_cpu(int num) sysfs_cpus[num].cpu.no_control = 1; #endif - return register_cpu(&sysfs_cpus[num].cpu, num, parent); + return register_cpu(&sysfs_cpus[num].cpu, num); } #ifdef CONFIG_HOTPLUG_CPU void arch_unregister_cpu(int num) { - struct node *parent = NULL; - -#ifdef CONFIG_NUMA - int node = cpu_to_node(num); - parent = &node_devices[node]; -#endif /* CONFIG_NUMA */ - - return unregister_cpu(&sysfs_cpus[num].cpu, parent); + return unregister_cpu(&sysfs_cpus[num].cpu); } EXPORT_SYMBOL(arch_register_cpu); EXPORT_SYMBOL(arch_unregister_cpu); diff -puN arch/m32r/kernel/setup.c~node-hotplug-fixes-callres-of-register_cpu arch/m32r/kernel/setup.c --- 25/arch/m32r/kernel/setup.c~node-hotplug-fixes-callres-of-register_cpu Fri May 26 16:03:25 2006 +++ 25-akpm/arch/m32r/kernel/setup.c Fri May 26 16:03:25 2006 @@ -275,7 +275,7 @@ static int __init topology_init(void) int i; for_each_present_cpu(i) - register_cpu(&cpu_devices[i], i, NULL); + register_cpu(&cpu_devices[i], i); return 0; } diff -puN arch/mips/kernel/smp.c~node-hotplug-fixes-callres-of-register_cpu arch/mips/kernel/smp.c --- 25/arch/mips/kernel/smp.c~node-hotplug-fixes-callres-of-register_cpu Fri May 26 16:03:25 2006 +++ 25-akpm/arch/mips/kernel/smp.c Fri May 26 16:03:25 2006 @@ -443,7 +443,7 @@ static int __init topology_init(void) int ret; for_each_possible_cpu(cpu) { - ret = register_cpu(&per_cpu(cpu_devices, cpu), cpu, NULL); + ret = register_cpu(&per_cpu(cpu_devices, cpu), cpu); if (ret) printk(KERN_WARNING "topology_init: register_cpu %d " "failed (%d)\n", cpu, ret); diff -puN arch/parisc/kernel/topology.c~node-hotplug-fixes-callres-of-register_cpu arch/parisc/kernel/topology.c --- 25/arch/parisc/kernel/topology.c~node-hotplug-fixes-callres-of-register_cpu Fri May 26 16:03:25 2006 +++ 25-akpm/arch/parisc/kernel/topology.c Fri May 26 16:03:25 2006 @@ -26,11 +26,10 @@ static struct cpu cpu_devices[NR_CPUS] _ static int __init topology_init(void) { - struct node *parent = NULL; int num; for_each_present_cpu(num) { - register_cpu(&cpu_devices[num], num, parent); + register_cpu(&cpu_devices[num], num); } return 0; } diff -puN arch/powerpc/kernel/setup_32.c~node-hotplug-fixes-callres-of-register_cpu arch/powerpc/kernel/setup_32.c --- 25/arch/powerpc/kernel/setup_32.c~node-hotplug-fixes-callres-of-register_cpu Fri May 26 16:03:25 2006 +++ 25-akpm/arch/powerpc/kernel/setup_32.c Fri May 26 16:03:25 2006 @@ -215,7 +215,7 @@ int __init ppc_init(void) /* register CPU devices */ for_each_possible_cpu(i) - register_cpu(&cpu_devices[i], i, NULL); + register_cpu(&cpu_devices[i], i); /* call platform init */ if (ppc_md.init != NULL) { diff -puN arch/powerpc/kernel/sysfs.c~node-hotplug-fixes-callres-of-register_cpu arch/powerpc/kernel/sysfs.c --- 25/arch/powerpc/kernel/sysfs.c~node-hotplug-fixes-callres-of-register_cpu Fri May 26 16:03:25 2006 +++ 25-akpm/arch/powerpc/kernel/sysfs.c Fri May 26 16:03:25 2006 @@ -357,14 +357,6 @@ static int __init topology_init(void) for_each_possible_cpu(cpu) { struct cpu *c = &per_cpu(cpu_devices, cpu); -#ifdef CONFIG_NUMA - /* The node to which a cpu belongs can't be known - * until the cpu is made present. - */ - parent = NULL; - if (cpu_present(cpu)) - parent = &node_devices[cpu_to_node(cpu)]; -#endif /* * For now, we just see if the system supports making * the RTAS calls for CPU hotplug. But, there may be a @@ -376,7 +368,7 @@ static int __init topology_init(void) c->no_control = 1; if (cpu_online(cpu) || (c->no_control == 0)) { - register_cpu(c, cpu, parent); + register_cpu(c, cpu); sysdev_create_file(&c->sysdev, &attr_physical_id); } diff -puN arch/ppc/kernel/setup.c~node-hotplug-fixes-callres-of-register_cpu arch/ppc/kernel/setup.c --- 25/arch/ppc/kernel/setup.c~node-hotplug-fixes-callres-of-register_cpu Fri May 26 16:03:25 2006 +++ 25-akpm/arch/ppc/kernel/setup.c Fri May 26 16:03:25 2006 @@ -475,7 +475,7 @@ int __init ppc_init(void) /* register CPU devices */ for_each_possible_cpu(i) - register_cpu(&cpu_devices[i], i, NULL); + register_cpu(&cpu_devices[i], i); /* call platform init */ if (ppc_md.init != NULL) { diff -puN arch/s390/kernel/smp.c~node-hotplug-fixes-callres-of-register_cpu arch/s390/kernel/smp.c --- 25/arch/s390/kernel/smp.c~node-hotplug-fixes-callres-of-register_cpu Fri May 26 16:03:25 2006 +++ 25-akpm/arch/s390/kernel/smp.c Fri May 26 16:03:25 2006 @@ -869,7 +869,7 @@ static int __init topology_init(void) int ret; for_each_possible_cpu(cpu) { - ret = register_cpu(&per_cpu(cpu_devices, cpu), cpu, NULL); + ret = register_cpu(&per_cpu(cpu_devices, cpu), cpu); if (ret) printk(KERN_WARNING "topology_init: register_cpu %d " "failed (%d)\n", cpu, ret); diff -puN arch/sh64/kernel/setup.c~node-hotplug-fixes-callres-of-register_cpu arch/sh64/kernel/setup.c --- 25/arch/sh64/kernel/setup.c~node-hotplug-fixes-callres-of-register_cpu Fri May 26 16:03:25 2006 +++ 25-akpm/arch/sh64/kernel/setup.c Fri May 26 16:03:25 2006 @@ -309,7 +309,7 @@ static struct cpu cpu[1]; static int __init topology_init(void) { - return register_cpu(cpu, 0, NULL); + return register_cpu(cpu, 0); } subsys_initcall(topology_init); diff -puN arch/sh/kernel/setup.c~node-hotplug-fixes-callres-of-register_cpu arch/sh/kernel/setup.c --- 25/arch/sh/kernel/setup.c~node-hotplug-fixes-callres-of-register_cpu Fri May 26 16:03:25 2006 +++ 25-akpm/arch/sh/kernel/setup.c Fri May 26 16:03:25 2006 @@ -402,7 +402,7 @@ static int __init topology_init(void) int cpu_id; for_each_possible_cpu(cpu_id) - register_cpu(&cpu[cpu_id], cpu_id, NULL); + register_cpu(&cpu[cpu_id], cpu_id); return 0; } diff -puN arch/sparc64/kernel/setup.c~node-hotplug-fixes-callres-of-register_cpu arch/sparc64/kernel/setup.c --- 25/arch/sparc64/kernel/setup.c~node-hotplug-fixes-callres-of-register_cpu Fri May 26 16:03:25 2006 +++ 25-akpm/arch/sparc64/kernel/setup.c Fri May 26 16:03:25 2006 @@ -568,7 +568,7 @@ static int __init topology_init(void) for_each_possible_cpu(i) { struct cpu *p = kzalloc(sizeof(*p), GFP_KERNEL); if (p) { - register_cpu(p, i, NULL); + register_cpu(p, i); err = 0; } } _