diff options
author | Noam Camus <noamc@ezchip.com> | 2015-12-15 20:10:27 -0500 |
---|---|---|
committer | Vineet Gupta <vgupta@synopsys.com> | 2015-12-17 02:26:43 -0500 |
commit | b474a02382b75f4a75c4e94eb9847aad28dd4a37 (patch) | |
tree | be2d5c077c6f62b682022b5d0a905cf7f8c60496 | |
parent | 323f41f9e7d0cb5b1d1586aded6682855f1e646d (diff) |
ARC: rename smp operation init_irq_cpu() to init_per_cpu()
This will better reflect its description i.e. "any needed setup..."
and not just do an "IPI request".
Signed-off-by: Noam Camus <noamc@ezchip.com>
Acked-by: Vineet Gupta <vgupta@synopsys.com>
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
-rw-r--r-- | arch/arc/include/asm/smp.h | 4 | ||||
-rw-r--r-- | arch/arc/kernel/irq.c | 4 | ||||
-rw-r--r-- | arch/arc/kernel/mcip.c | 2 | ||||
-rw-r--r-- | arch/arc/kernel/smp.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/arch/arc/include/asm/smp.h b/arch/arc/include/asm/smp.h index 133c867d15af..991380438d6b 100644 --- a/arch/arc/include/asm/smp.h +++ b/arch/arc/include/asm/smp.h | |||
@@ -48,7 +48,7 @@ extern int smp_ipi_irq_setup(int cpu, int irq); | |||
48 | * @init_early_smp: A SMP specific h/w block can init itself | 48 | * @init_early_smp: A SMP specific h/w block can init itself |
49 | * Could be common across platforms so not covered by | 49 | * Could be common across platforms so not covered by |
50 | * mach_desc->init_early() | 50 | * mach_desc->init_early() |
51 | * @init_irq_cpu: Called for each core so SMP h/w block driver can do | 51 | * @init_per_cpu: Called for each core so SMP h/w block driver can do |
52 | * any needed setup per cpu (e.g. IPI request) | 52 | * any needed setup per cpu (e.g. IPI request) |
53 | * @cpu_kick: For Master to kickstart a cpu (optionally at a PC) | 53 | * @cpu_kick: For Master to kickstart a cpu (optionally at a PC) |
54 | * @ipi_send: To send IPI to a @cpu | 54 | * @ipi_send: To send IPI to a @cpu |
@@ -57,7 +57,7 @@ extern int smp_ipi_irq_setup(int cpu, int irq); | |||
57 | struct plat_smp_ops { | 57 | struct plat_smp_ops { |
58 | const char *info; | 58 | const char *info; |
59 | void (*init_early_smp)(void); | 59 | void (*init_early_smp)(void); |
60 | void (*init_irq_cpu)(int cpu); | 60 | void (*init_per_cpu)(int cpu); |
61 | void (*cpu_kick)(int cpu, unsigned long pc); | 61 | void (*cpu_kick)(int cpu, unsigned long pc); |
62 | void (*ipi_send)(int cpu); | 62 | void (*ipi_send)(int cpu); |
63 | void (*ipi_clear)(int irq); | 63 | void (*ipi_clear)(int irq); |
diff --git a/arch/arc/kernel/irq.c b/arch/arc/kernel/irq.c index b1f75937f0e1..3917fe7e62fc 100644 --- a/arch/arc/kernel/irq.c +++ b/arch/arc/kernel/irq.c | |||
@@ -29,8 +29,8 @@ void __init init_IRQ(void) | |||
29 | 29 | ||
30 | #ifdef CONFIG_SMP | 30 | #ifdef CONFIG_SMP |
31 | /* a SMP H/w block could do IPI IRQ request here */ | 31 | /* a SMP H/w block could do IPI IRQ request here */ |
32 | if (plat_smp_ops.init_irq_cpu) | 32 | if (plat_smp_ops.init_per_cpu) |
33 | plat_smp_ops.init_irq_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_cpu_smp) |
36 | machine_desc->init_cpu_smp(smp_processor_id()); | 36 | machine_desc->init_cpu_smp(smp_processor_id()); |
diff --git a/arch/arc/kernel/mcip.c b/arch/arc/kernel/mcip.c index 74a9b074ac3e..bd237acdf4f2 100644 --- a/arch/arc/kernel/mcip.c +++ b/arch/arc/kernel/mcip.c | |||
@@ -132,7 +132,7 @@ static void mcip_probe_n_setup(void) | |||
132 | struct plat_smp_ops plat_smp_ops = { | 132 | struct plat_smp_ops plat_smp_ops = { |
133 | .info = smp_cpuinfo_buf, | 133 | .info = smp_cpuinfo_buf, |
134 | .init_early_smp = mcip_probe_n_setup, | 134 | .init_early_smp = mcip_probe_n_setup, |
135 | .init_irq_cpu = mcip_setup_per_cpu, | 135 | .init_per_cpu = mcip_setup_per_cpu, |
136 | .ipi_send = mcip_ipi_send, | 136 | .ipi_send = mcip_ipi_send, |
137 | .ipi_clear = mcip_ipi_clear, | 137 | .ipi_clear = mcip_ipi_clear, |
138 | }; | 138 | }; |
diff --git a/arch/arc/kernel/smp.c b/arch/arc/kernel/smp.c index 580587805fa3..0b061a475158 100644 --- a/arch/arc/kernel/smp.c +++ b/arch/arc/kernel/smp.c | |||
@@ -132,8 +132,8 @@ void start_kernel_secondary(void) | |||
132 | pr_info("## CPU%u LIVE ##: Executing Code...\n", cpu); | 132 | pr_info("## CPU%u LIVE ##: Executing Code...\n", cpu); |
133 | 133 | ||
134 | /* Some SMP H/w setup - for each cpu */ | 134 | /* Some SMP H/w setup - for each cpu */ |
135 | if (plat_smp_ops.init_irq_cpu) | 135 | if (plat_smp_ops.init_per_cpu) |
136 | plat_smp_ops.init_irq_cpu(cpu); | 136 | plat_smp_ops.init_per_cpu(cpu); |
137 | 137 | ||
138 | if (machine_desc->init_cpu_smp) | 138 | if (machine_desc->init_cpu_smp) |
139 | machine_desc->init_cpu_smp(cpu); | 139 | machine_desc->init_cpu_smp(cpu); |