ARM: remove some dead code

[ Upstream commit 85c2346b539a6d4c8218051f58bbe40638b9b542 ]

This code appears to be no longer used so let's get rid of it.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Tested-by: Keith Packard <keithpac@amazon.com>
Tested-by: Marc Zyngier <maz@kernel.org>
Tested-by: Vladimir Murzin <vladimir.murzin@arm.com> # ARMv7M
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm/include/asm/entry-macro-multi.S b/arch/arm/include/asm/entry-macro-multi.S
index dfc6bfa430121673015fb927349b161c94798217..24486dad9e19b6dbbdf11a8ab7ef948337586007 100644 (file)
--- a/arch/arm/include/asm/entry-macro-multi.S
+++ b/arch/arm/include/asm/entry-macro-multi.S
@@ -13,28 +13,4 @@
        @
        badrne  lr, 1b
        bne     asm_do_IRQ
-
-#ifdef CONFIG_SMP
-       /*
-        * XXX
-        *
-        * this macro assumes that irqstat (r2) and base (r6) are
-        * preserved from get_irqnr_and_base above
-        */
-       ALT_SMP(test_for_ipi r0, r2, r6, lr)
-       ALT_UP_B(9997f)
-       movne   r1, sp
-       badrne  lr, 1b
-       bne     do_IPI
-#endif
-9997:
-       .endm
-
-       .macro  arch_irq_handler, symbol_name
-       .align  5
-       .global \symbol_name
-\symbol_name:
-       mov     r8, lr
-       arch_irq_handler_default
-       ret     r8
        .endm

diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
index 5d508f5d56c49d7895cf58499c64392476d84e69..fc11ddf13b8fd61c67a5b9142e3d2862c9852551 100644 (file)
--- a/arch/arm/include/asm/smp.h
+++ b/arch/arm/include/asm/smp.h
@@ -24,11 +24,6 @@ struct seq_file;
  */
 extern void show_ipi_list(struct seq_file *, int);
 
-/*
- * Called from assembly code, this handles an IPI.
- */
-asmlinkage void do_IPI(int ipinr, struct pt_regs *regs);
-
 /*
  * Called from C code, this handles an IPI.
  */

diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 842427ff2b3cbf360cf14eaade659050e305397d..23d369ab7e03733bd62eb0bdbecae965d8824813 100644 (file)
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -622,11 +622,6 @@ static void ipi_complete(unsigned int cpu)
 /*
  * Main handler for inter-processor interrupts
  */
-asmlinkage void __exception_irq_entry do_IPI(int ipinr, struct pt_regs *regs)
-{
-       handle_IPI(ipinr, regs);
-}
-
 static void do_handle_IPI(int ipinr)
 {
        unsigned int cpu = smp_processor_id();