Commit-ID:  3bec6def39e32609e01a68b43476ee1f1c512eaa
Gitweb:     http://git.kernel.org/tip/3bec6def39e32609e01a68b43476ee1f1c512eaa
Author:     Thomas Gleixner <[email protected]>
AuthorDate: Mon, 28 Aug 2017 08:47:24 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 29 Aug 2017 11:42:24 +0200

x86/apic: Use this_cpu_ptr() in local_timer_interrupt()

Accessing the per cpu data via per_cpu(, smp_processor_id()) is
pointless. Use this_cpu_ptr() instead.

Signed-off-by: Thomas Gleixner <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Steven Rostedt <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
 arch/x86/kernel/apic/apic.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 7a57b54..a33fa44 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -988,8 +988,7 @@ void setup_secondary_APIC_clock(void)
  */
 static void local_apic_timer_interrupt(void)
 {
-       int cpu = smp_processor_id();
-       struct clock_event_device *evt = &per_cpu(lapic_events, cpu);
+       struct clock_event_device *evt = this_cpu_ptr(&lapic_events);
 
        /*
         * Normally we should not be here till LAPIC has been initialized but
@@ -1003,7 +1002,8 @@ static void local_apic_timer_interrupt(void)
         * spurious.
         */
        if (!evt->event_handler) {
-               pr_warning("Spurious LAPIC timer interrupt on cpu %d\n", cpu);
+               pr_warning("Spurious LAPIC timer interrupt on cpu %d\n",
+                          smp_processor_id());
                /* Switch it off */
                lapic_timer_shutdown(evt);
                return;

Reply via email to