Skip to content

Commit

Permalink
ARC: smp: Rename platform hook @init_cpu_smp -> @init_per_cpu
Browse files Browse the repository at this point in the history
Makes it similar to smp_ops which also has callback with same name

Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
  • Loading branch information
Vineet Gupta committed Dec 17, 2015
1 parent b474a02 commit 575a9d4
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions arch/arc/include/asm/mach_desc.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* @dt_compat: Array of device tree 'compatible' strings
* (XXX: although only 1st entry is looked at)
* @init_early: Very early callback [called from setup_arch()]
* @init_cpu_smp: for each CPU as it is coming up (SMP as well as UP)
* @init_per_cpu: for each CPU as it is coming up (SMP as well as UP)
* [(M):init_IRQ(), (o):start_kernel_secondary()]
* @init_machine: arch initcall level callback (e.g. populate static
* platform devices or parse Devicetree)
Expand All @@ -35,7 +35,7 @@ struct machine_desc {
const char **dt_compat;
void (*init_early)(void);
#ifdef CONFIG_SMP
void (*init_cpu_smp)(unsigned int);
void (*init_per_cpu)(unsigned int);
#endif
void (*init_machine)(void);
void (*init_late)(void);
Expand Down
4 changes: 2 additions & 2 deletions arch/arc/kernel/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ void __init init_IRQ(void)
if (plat_smp_ops.init_per_cpu)
plat_smp_ops.init_per_cpu(smp_processor_id());

if (machine_desc->init_cpu_smp)
machine_desc->init_cpu_smp(smp_processor_id());
if (machine_desc->init_per_cpu)
machine_desc->init_per_cpu(smp_processor_id());
#endif
}

Expand Down
4 changes: 2 additions & 2 deletions arch/arc/kernel/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ void start_kernel_secondary(void)
if (plat_smp_ops.init_per_cpu)
plat_smp_ops.init_per_cpu(cpu);

if (machine_desc->init_cpu_smp)
machine_desc->init_cpu_smp(cpu);
if (machine_desc->init_per_cpu)
machine_desc->init_per_cpu(cpu);

arc_local_timer_setup();

Expand Down

0 comments on commit 575a9d4

Please sign in to comment.