From nobody Fri Apr 3 12:48:45 2026 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C34E834DB44 for ; Thu, 19 Feb 2026 17:13:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771521211; cv=none; b=bptC7b9hCnVd+VaGM+E499dVa+cyyWqI8l/8A8cZbFVuPYJFpM+6lnp40AdDgAvR1dPsiLEZ5K6E5V0O+ksuGUFOz7c8hh9mZfrLjZ17arvx/IFk6SIw+AjaNJVZx9z302HMXZgXSrS8iJcdHxLeh6PIjD1kF6m4PuqqixTpIFE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771521211; c=relaxed/simple; bh=YY7i+ekw8WEClpFqVZfbZbIPcOFXG9mqoVtYSHhdgrE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nWwKtnLFiQoYZDbEnSuO0e06aAJ6Wr+OiyQiLRS+5vTgTS0UosNP2yX+sn88kYkLsQLW6sjf0USX5Iygm8f9mjUFUHikSi+ryZkAWwCWoEIqBkZpcEVU1s2IUptGgwEWE44euq8zxeu9ahSpoBtZHCGjkVL5Mbnuqx8ca5gq+O0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=jR00ZLgb; arc=none smtp.client-ip=209.85.210.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jR00ZLgb" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-823081bb15fso661530b3a.3 for ; Thu, 19 Feb 2026 09:13:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771521208; x=1772126008; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Lru4V+cwKFfxLK/nzfZUd/f7wkQ+5dEE9KWoaatQVPo=; b=jR00ZLgbANM9QQcV6D1qJrZXE56WthEzEZ/6cBIiXYM3oppVe7F9M6qiq0g1aTyy2U 9RU3gzgybGUrlFOclauBaMFM8Pjri1YBXFs6zeIUMulSYXvkaxlRxVNUEqXz84QS1hlh ei43FJYHkEf/s/LyLMUYeAJT6UXdpxzPc0EFg273eS9dm2LNlyQzFehc+3Di0C8MLDdc LAdN6Nw14anWlSnNvDX90x23v4ntd2aZIhv/nj09v35hLvtXYDEGcTHweSxR+OIcqXy+ IUKj2uUNw0lwKvRbXY+z3/nqZEX+4oBXsmBsZmSSfwASZV5ZqWS++Oaj+JPn6iOUE0y4 uN5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771521208; x=1772126008; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Lru4V+cwKFfxLK/nzfZUd/f7wkQ+5dEE9KWoaatQVPo=; b=XWJPKNb8SR0R519EQuXDVW691sQ2NDexh1AsyqPJGsdq51S0H+NHAwt4iH4NpY8F0o HTqqdHrp7xMFtkdWPJYJONIAYJQz6YWNS9OXKh06WOmK/7coyLsw+0mzGUnK8B8wdN7j mON5XGX6cflwkeQ8EhA5Y4eZrD9BvPK2quXKVfU5GLIYVPwH5TqqHqThtc0zPMgA0ePs y/8Zjt4rZ1ug/wlojLo+AyunIWZCYPUO/X+p7GaVgSbIy8iH9g08s+fcGN6PMW0EW8Wz 3s1PRGBfL+TuW/To7BpXul6AwyFMpWp2Nzk9MlA48NBauFjswpm9XqdD+ZN7xdvEfqP1 jc9g== X-Forwarded-Encrypted: i=1; AJvYcCUZqbvlDmmTEzsX8MwQnxuwTbPnJzvlltSlqbcqL2LVB3G3U87FfnUm4BFg2/X7VMWNFwKcJB9nB5zi5yQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyEvauRT7NhlAVL/wv3GVFrLHEsuLQPMTXP5AhczzmPd2d3PHAD dIRbK4faNrSDtg1QeU0G69qS4itpgvUQcFzNQAe1//SSWvK+IdRnyf3k X-Gm-Gg: AZuq6aIqZj/dfT/Jx4eRHprEDLG3s9qMSV7te0ar3ll97q/ZvffMkNRYt93lJ4xyzNZ E9DP1d7ClqjFh4fVO2hcrtxnObwgKV1hgKPlZEmssWTsilI0XF4JU+x5rhi/dy3t0b3IoR3iGE7 OkKvIYAkhRRrtAoIHaFAzRpmWWggH0Hnfad2YXvaa1TJN7w0aQuBvWZU//oUeep5epwPYLT/Lox ns8WCk26dYdpO+nT8dyICsc0NcrxIvbGCm9NEPH6x8E1PCKMBhIxHiIpvvN/t+K50Y9l6AePl+s nbda7RqgSXC64HS7VPmnKbf4+sA5k6+ueQzAXJPZN0z9dqHPzOsTEqv4HNILe43XqGKDR0ti4w/ Kw/VkU7rvwcitAhVoN6gcY0LJKKS00S/IkFrduHPVSSy7IVr5ZgCgSom2aJF0nTTDjr1BgCnNHv x/LQcRHmcm2RAYPutaTwwIyUXiSWzT+h3qDqD6a3W91ifPBDJbBQ== X-Received: by 2002:a05:6a21:4c03:b0:38d:e9e8:25e0 with SMTP id adf61e73a8af0-39483897793mr17324026637.20.1771521208129; Thu, 19 Feb 2026 09:13:28 -0800 (PST) Received: from name2965-Precision-7820-Tower.. ([121.185.236.165]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c6e532fa2e5sm15895002a12.26.2026.02.19.09.13.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Feb 2026 09:13:27 -0800 (PST) From: Jeongjun Park To: stable@vger.kernel.org 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, zouyipeng@huawei.com, aha310510@gmail.com, linux-staging@lists.linux.dev, Jacob Keller Subject: [PATCH 5.10.y 03/15] clocksource/drivers/arm_arch_timer: Do not use timer namespace for timer_shutdown() function Date: Fri, 20 Feb 2026 02:12:58 +0900 Message-Id: <20260219171310.118170-4-aha310510@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260219171310.118170-1-aha310510@gmail.com> References: <20260219171310.118170-1-aha310510@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: "Steven Rostedt (Google)" [ Upstream commit 73737a5833ace25a8408b0d3b783637cb6bf29d1 ] A new "shutdown" timer state is being added to the generic timer code. One of the functions to change the timer into the state is called "timer_shutdown()". This means that there can not be other functions called "timer_shutdown()" as the timer code owns the "timer_*" name space. Rename timer_shutdown() to arch_timer_shutdown() to avoid this conflict. Signed-off-by: Steven Rostedt (Google) Signed-off-by: Thomas Gleixner Tested-by: Guenter Roeck Reviewed-by: Guenter Roeck Reviewed-by: Jacob Keller Reviewed-by: Anna-Maria Behnsen Acked-by: Marc Zyngier Link: https://lkml.kernel.org/r/20221106212702.002251651@goodmis.org Link: https://lore.kernel.org/all/20221105060155.409832154@goodmis.org/ Link: https://lore.kernel.org/r/20221110064146.981725531@goodmis.org Link: https://lore.kernel.org/r/20221123201624.574672568@linutronix.de Signed-off-by: Jeongjun Park --- drivers/clocksource/arm_arch_timer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm= _arch_timer.c index fee1c4bf1021..ddcbf2b19651 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -687,8 +687,8 @@ static irqreturn_t arch_timer_handler_virt_mem(int irq,= void *dev_id) return timer_handler(ARCH_TIMER_MEM_VIRT_ACCESS, evt); } =20 -static __always_inline int timer_shutdown(const int access, - struct clock_event_device *clk) +static __always_inline int arch_timer_shutdown(const int access, + struct clock_event_device *clk) { unsigned long ctrl; =20 @@ -701,22 +701,22 @@ static __always_inline int timer_shutdown(const int a= ccess, =20 static int arch_timer_shutdown_virt(struct clock_event_device *clk) { - return timer_shutdown(ARCH_TIMER_VIRT_ACCESS, clk); + return arch_timer_shutdown(ARCH_TIMER_VIRT_ACCESS, clk); } =20 static int arch_timer_shutdown_phys(struct clock_event_device *clk) { - return timer_shutdown(ARCH_TIMER_PHYS_ACCESS, clk); + return arch_timer_shutdown(ARCH_TIMER_PHYS_ACCESS, clk); } =20 static int arch_timer_shutdown_virt_mem(struct clock_event_device *clk) { - return timer_shutdown(ARCH_TIMER_MEM_VIRT_ACCESS, clk); + return arch_timer_shutdown(ARCH_TIMER_MEM_VIRT_ACCESS, clk); } =20 static int arch_timer_shutdown_phys_mem(struct clock_event_device *clk) { - return timer_shutdown(ARCH_TIMER_MEM_PHYS_ACCESS, clk); + return arch_timer_shutdown(ARCH_TIMER_MEM_PHYS_ACCESS, clk); } =20 static __always_inline void set_next_event(const int access, unsigned long= evt, --