diff options
author | Jiang Liu <liuj97@gmail.com> | 2013-12-04 11:13:01 -0500 |
---|---|---|
committer | James Hogan <james.hogan@imgtec.com> | 2013-12-05 11:35:29 -0500 |
commit | 1d61cf121d7d9085145553294307e81c25586288 (patch) | |
tree | 0d1b43ccc9f73a45c761ea601394bf81195475c1 /arch/metag | |
parent | 5a25f7bb5aa1b2f876d9df81c44b516e015022f8 (diff) |
smp, metag: kill SMP single function call interrupt
Commit 9a46ad6d6df3 "smp: make smp_call_function_many() use logic
similar to smp_call_function_single()" has unified the way to handle
single and multiple cross-CPU function calls. Now only one interrupt is
needed for architecture specific code to support generic SMP function
call interfaces, so kill the redundant single function call interrupt.
Signed-off-by: Jiang Liu <liuj97@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Shaohua Li <shli@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Jiri Kosina <trivial@kernel.org>
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Diffstat (limited to 'arch/metag')
-rw-r--r-- | arch/metag/include/asm/smp.h | 2 | ||||
-rw-r--r-- | arch/metag/kernel/smp.c | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/arch/metag/include/asm/smp.h b/arch/metag/include/asm/smp.h index e0373f81a117..1d7e770f7a54 100644 --- a/arch/metag/include/asm/smp.h +++ b/arch/metag/include/asm/smp.h | |||
@@ -7,13 +7,11 @@ | |||
7 | 7 | ||
8 | enum ipi_msg_type { | 8 | enum ipi_msg_type { |
9 | IPI_CALL_FUNC, | 9 | IPI_CALL_FUNC, |
10 | IPI_CALL_FUNC_SINGLE, | ||
11 | IPI_RESCHEDULE, | 10 | IPI_RESCHEDULE, |
12 | }; | 11 | }; |
13 | 12 | ||
14 | extern void arch_send_call_function_single_ipi(int cpu); | 13 | extern void arch_send_call_function_single_ipi(int cpu); |
15 | extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); | 14 | extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); |
16 | #define arch_send_call_function_ipi_mask arch_send_call_function_ipi_mask | ||
17 | 15 | ||
18 | asmlinkage void secondary_start_kernel(void); | 16 | asmlinkage void secondary_start_kernel(void); |
19 | 17 | ||
diff --git a/arch/metag/kernel/smp.c b/arch/metag/kernel/smp.c index 177ffb408c5a..f74008b6da07 100644 --- a/arch/metag/kernel/smp.c +++ b/arch/metag/kernel/smp.c | |||
@@ -491,7 +491,7 @@ void arch_send_call_function_ipi_mask(const struct cpumask *mask) | |||
491 | 491 | ||
492 | void arch_send_call_function_single_ipi(int cpu) | 492 | void arch_send_call_function_single_ipi(int cpu) |
493 | { | 493 | { |
494 | send_ipi_message(cpumask_of(cpu), IPI_CALL_FUNC_SINGLE); | 494 | send_ipi_message(cpumask_of(cpu), IPI_CALL_FUNC); |
495 | } | 495 | } |
496 | 496 | ||
497 | void show_ipi_list(struct seq_file *p) | 497 | void show_ipi_list(struct seq_file *p) |
@@ -545,10 +545,6 @@ static int do_IPI(void) | |||
545 | generic_smp_call_function_interrupt(); | 545 | generic_smp_call_function_interrupt(); |
546 | break; | 546 | break; |
547 | 547 | ||
548 | case IPI_CALL_FUNC_SINGLE: | ||
549 | generic_smp_call_function_single_interrupt(); | ||
550 | break; | ||
551 | |||
552 | default: | 548 | default: |
553 | pr_crit("CPU%u: Unknown IPI message 0x%lx\n", | 549 | pr_crit("CPU%u: Unknown IPI message 0x%lx\n", |
554 | cpu, nextmsg); | 550 | cpu, nextmsg); |