x86/irq: Get rid of duplicated trace_x86_platform_ipi() code

[mirror_ubuntu-bionic-kernel.git] / arch / x86 / kernel / irq.c

diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 019d0ac8ed3ad92af7a058d8a55c73299eec02fc..befdd4a54eccf4d211f2114cb1ca15801061cc1d 100644 (file)
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -262,20 +262,16 @@ __visible unsigned int __irq_entry do_IRQ(struct pt_regs *regs)
 /*
  * Handler for X86_PLATFORM_IPI_VECTOR.
  */
-void __smp_x86_platform_ipi(void)
-{
-       inc_irq_stat(x86_platform_ipis);
-
-       if (x86_platform_ipi_callback)
-               x86_platform_ipi_callback();
-}
-
 __visible void __irq_entry smp_x86_platform_ipi(struct pt_regs *regs)
 {
        struct pt_regs *old_regs = set_irq_regs(regs);
 
        entering_ack_irq();
-       __smp_x86_platform_ipi();
+       trace_x86_platform_ipi_entry(X86_PLATFORM_IPI_VECTOR);
+       inc_irq_stat(x86_platform_ipis);
+       if (x86_platform_ipi_callback)
+               x86_platform_ipi_callback();
+       trace_x86_platform_ipi_exit(X86_PLATFORM_IPI_VECTOR);
        exiting_irq();
        set_irq_regs(old_regs);
 }
@@ -334,17 +330,6 @@ __visible void smp_kvm_posted_intr_nested_ipi(struct pt_regs *regs)
 }
 #endif
 
-__visible void __irq_entry smp_trace_x86_platform_ipi(struct pt_regs *regs)
-{
-       struct pt_regs *old_regs = set_irq_regs(regs);
-
-       entering_ack_irq();
-       trace_x86_platform_ipi_entry(X86_PLATFORM_IPI_VECTOR);
-       __smp_x86_platform_ipi();
-       trace_x86_platform_ipi_exit(X86_PLATFORM_IPI_VECTOR);
-       exiting_irq();
-       set_irq_regs(old_regs);
-}
 
 #ifdef CONFIG_HOTPLUG_CPU