diff options
author | Vineet Gupta <vgupta@synopsys.com> | 2015-12-17 01:52:21 -0500 |
---|---|---|
committer | Vineet Gupta <vgupta@synopsys.com> | 2015-12-17 02:26:56 -0500 |
commit | 575a9d4e2c09675c05db2bc781c5c33153ce932f (patch) | |
tree | e453e976683bd335919824f9dd4ed2e9af99d06d | |
parent | b474a02382b75f4a75c4e94eb9847aad28dd4a37 (diff) |
ARC: smp: Rename platform hook @init_cpu_smp -> @init_per_cpu
Makes it similar to smp_ops which also has callback with same name
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
-rw-r--r-- | arch/arc/include/asm/mach_desc.h | 4 | ||||
-rw-r--r-- | arch/arc/kernel/irq.c | 4 | ||||
-rw-r--r-- | arch/arc/kernel/smp.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/arc/include/asm/mach_desc.h b/arch/arc/include/asm/mach_desc.h index 6ff657a904b6..c28e6c347b49 100644 --- a/arch/arc/include/asm/mach_desc.h +++ b/arch/arc/include/asm/mach_desc.h | |||
@@ -23,7 +23,7 @@ | |||
23 | * @dt_compat: Array of device tree 'compatible' strings | 23 | * @dt_compat: Array of device tree 'compatible' strings |
24 | * (XXX: although only 1st entry is looked at) | 24 | * (XXX: although only 1st entry is looked at) |
25 | * @init_early: Very early callback [called from setup_arch()] | 25 | * @init_early: Very early callback [called from setup_arch()] |
26 | * @init_cpu_smp: for each CPU as it is coming up (SMP as well as UP) | 26 | * @init_per_cpu: for each CPU as it is coming up (SMP as well as UP) |
27 | * [(M):init_IRQ(), (o):start_kernel_secondary()] | 27 | * [(M):init_IRQ(), (o):start_kernel_secondary()] |
28 | * @init_machine: arch initcall level callback (e.g. populate static | 28 | * @init_machine: arch initcall level callback (e.g. populate static |
29 | * platform devices or parse Devicetree) | 29 | * platform devices or parse Devicetree) |
@@ -35,7 +35,7 @@ struct machine_desc { | |||
35 | const char **dt_compat; | 35 | const char **dt_compat; |
36 | void (*init_early)(void); | 36 | void (*init_early)(void); |
37 | #ifdef CONFIG_SMP | 37 | #ifdef CONFIG_SMP |
38 | void (*init_cpu_smp)(unsigned int); | 38 | void (*init_per_cpu)(unsigned int); |
39 | #endif | 39 | #endif |
40 | void (*init_machine)(void); | 40 | void (*init_machine)(void); |
41 | void (*init_late)(void); | 41 | void (*init_late)(void); |
diff --git a/arch/arc/kernel/irq.c b/arch/arc/kernel/irq.c index 3917fe7e62fc..ba17f85285cf 100644 --- a/arch/arc/kernel/irq.c +++ b/arch/arc/kernel/irq.c | |||
@@ -32,8 +32,8 @@ void __init init_IRQ(void) | |||
32 | if (plat_smp_ops.init_per_cpu) | 32 | if (plat_smp_ops.init_per_cpu) |
33 | plat_smp_ops.init_per_cpu(smp_processor_id()); | 33 | plat_smp_ops.init_per_cpu(smp_processor_id()); |
34 | 34 | ||
35 | if (machine_desc->init_cpu_smp) | 35 | if (machine_desc->init_per_cpu) |
36 | machine_desc->init_cpu_smp(smp_processor_id()); | 36 | machine_desc->init_per_cpu(smp_processor_id()); |
37 | #endif | 37 | #endif |
38 | } | 38 | } |
39 | 39 | ||
diff --git a/arch/arc/kernel/smp.c b/arch/arc/kernel/smp.c index 0b061a475158..ef6e9e15b82a 100644 --- a/arch/arc/kernel/smp.c +++ b/arch/arc/kernel/smp.c | |||
@@ -135,8 +135,8 @@ void start_kernel_secondary(void) | |||
135 | if (plat_smp_ops.init_per_cpu) | 135 | if (plat_smp_ops.init_per_cpu) |
136 | plat_smp_ops.init_per_cpu(cpu); | 136 | plat_smp_ops.init_per_cpu(cpu); |
137 | 137 | ||
138 | if (machine_desc->init_cpu_smp) | 138 | if (machine_desc->init_per_cpu) |
139 | machine_desc->init_cpu_smp(cpu); | 139 | machine_desc->init_per_cpu(cpu); |
140 | 140 | ||
141 | arc_local_timer_setup(); | 141 | arc_local_timer_setup(); |
142 | 142 | ||