git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From aha310510@gmail.com Fri Oct 10 17:03:15 2025
   2 From: Jeongjun Park <aha310510@gmail.com>
   3 Date: Sat, 11 Oct 2025 00:02:43 +0900
   4 Subject: clocksource/drivers/arm_arch_timer: Do not use timer namespace for timer_shutdown() function
   5 To: stable@vger.kernel.org
   6 Cc: gregkh@linuxfoundation.org, tglx@linutronix.de, Julia.Lawall@inria.fr, akpm@linux-foundation.org, anna-maria@linutronix.de, arnd@arndb.de, linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, linux@roeck-us.net, luiz.dentz@gmail.com, marcel@holtmann.org, maz@kernel.org, peterz@infradead.org, rostedt@goodmis.org, sboyd@kernel.org, viresh.kumar@linaro.org, Jacob Keller <jacob.e.keller@intel.com>, Jeongjun Park <aha310510@gmail.com>
   7 Message-ID: <20251010150252.1115788-4-aha310510@gmail.com>
   8
   9 From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
  10
  11 [ Upstream commit 73737a5833ace25a8408b0d3b783637cb6bf29d1 ]
  12
  13 A new "shutdown" timer state is being added to the generic timer code. One
  14 of the functions to change the timer into the state is called
  15 "timer_shutdown()". This means that there can not be other functions
  16 called "timer_shutdown()" as the timer code owns the "timer_*" name space.
  17
  18 Rename timer_shutdown() to arch_timer_shutdown() to avoid this conflict.
  19
  20 Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
  21 Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  22 Tested-by: Guenter Roeck <linux@roeck-us.net>
  23 Reviewed-by: Guenter Roeck <linux@roeck-us.net>
  24 Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
  25 Reviewed-by: Anna-Maria Behnsen <anna-maria@linutronix.de>
  26 Acked-by: Marc Zyngier <maz@kernel.org>
  27 Link: https://lkml.kernel.org/r/20221106212702.002251651@goodmis.org
  28 Link: https://lore.kernel.org/all/20221105060155.409832154@goodmis.org/
  29 Link: https://lore.kernel.org/r/20221110064146.981725531@goodmis.org
  30 Link: https://lore.kernel.org/r/20221123201624.574672568@linutronix.de
  31 Signed-off-by: Jeongjun Park <aha310510@gmail.com>
  32 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  33 ---
  34  drivers/clocksource/arm_arch_timer.c |   12 ++++++------
  35  1 file changed, 6 insertions(+), 6 deletions(-)
  36
  37 --- a/drivers/clocksource/arm_arch_timer.c
  38 +++ b/drivers/clocksource/arm_arch_timer.c
  39 @@ -687,8 +687,8 @@ static irqreturn_t arch_timer_handler_vi
  40         return timer_handler(ARCH_TIMER_MEM_VIRT_ACCESS, evt);
  41  }
  42
  43 -static __always_inline int timer_shutdown(const int access,
  44 -                                         struct clock_event_device *clk)
  45 +static __always_inline int arch_timer_shutdown(const int access,
  46 +                                              struct clock_event_device *clk)
  47  {
  48         unsigned long ctrl;
  49
  50 @@ -701,22 +701,22 @@ static __always_inline int timer_shutdow
  51
  52  static int arch_timer_shutdown_virt(struct clock_event_device *clk)
  53  {
  54 -       return timer_shutdown(ARCH_TIMER_VIRT_ACCESS, clk);
  55 +       return arch_timer_shutdown(ARCH_TIMER_VIRT_ACCESS, clk);
  56  }
  57
  58  static int arch_timer_shutdown_phys(struct clock_event_device *clk)
  59  {
  60 -       return timer_shutdown(ARCH_TIMER_PHYS_ACCESS, clk);
  61 +       return arch_timer_shutdown(ARCH_TIMER_PHYS_ACCESS, clk);
  62  }
  63
  64  static int arch_timer_shutdown_virt_mem(struct clock_event_device *clk)
  65  {
  66 -       return timer_shutdown(ARCH_TIMER_MEM_VIRT_ACCESS, clk);
  67 +       return arch_timer_shutdown(ARCH_TIMER_MEM_VIRT_ACCESS, clk);
  68  }
  69
  70  static int arch_timer_shutdown_phys_mem(struct clock_event_device *clk)
  71  {
  72 -       return timer_shutdown(ARCH_TIMER_MEM_PHYS_ACCESS, clk);
  73 +       return arch_timer_shutdown(ARCH_TIMER_MEM_PHYS_ACCESS, clk);
  74  }
  75
  76  static __always_inline void set_next_event(const int access, unsigned long evt,