From nobody Sun Feb 8 11:16:45 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6DBAB2874E5; Thu, 8 May 2025 17:54:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746726875; cv=none; b=hArDr4ZvlQ89M5PLl1dRtFJdMZCrXFQMuZkPg3vgicBU44lLgT0EXl7NAKW6pmGxEj+QusmQ7nN2kfjVxL6dVlKqiCwClqXvG7zar9lbMKF7FGUzzOiXZwdubHjkurQxK7AkzrI+bXVi0LlTiQLQudv+fpxgDHKsGUxq8OHGF3Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746726875; c=relaxed/simple; bh=/J/qm6Mq2xk2tTG9Sjso5JpHkPdlM/37UeQjnx9hCB4=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=m3zyO8zPrXjmIio4GmVJwJkveLNDFBVv8XI8j3yXD90dDEfHTWol2AY0gUjLLVAqmdGjUXOjluYzlV0fo6/zkpBqbdKXZe/mrDfpktRl56UyHntehVX1me4oLMkMabof6eO+QlHe0EM3ANgvcV1g0cpmvHbj6FtAztx71WBOGsE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=dWFgAlKE; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=OvdAV5wE; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="dWFgAlKE"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="OvdAV5wE" Date: Thu, 08 May 2025 17:54:30 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1746726871; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PzDLtzkwsHBDfrK9JKxAtI5eeO/q75EJOup57fCHF7o=; b=dWFgAlKE9veFOeH5r2DX+0LTXTyZij7mOY3F4aj0VRIw1ULdf8d16Cz5OK3+fYxm+m8oyo Hwun/z2bT/6DmIcRypC0FmHBmXLu59oecXUj+YeybYbTC7AxLbSxLvIOmsAKXQUkZa5R+q zNRkt9XpdugkbUcyfJMbKbMhvuh60sqD2jBwgnhtQDso6UW7GgTbKNwgyG/hOQa/evHkny 1oWUnADKaFAVLzCI48ZWCA++243N329hINf8L29IOze4yeftfXdgDvjVMwcl6jtNklxXR9 wQWDtN0U3SFJBZ7YxHFQ+KFj/QBxTtHkm6rHzF/Is5Cr3qgudCQQ85quFi9OqQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1746726871; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PzDLtzkwsHBDfrK9JKxAtI5eeO/q75EJOup57fCHF7o=; b=OvdAV5wEfuKGx5vpOmQDsFVttaBN234SmGAf0KLrdH3BJiu0xZYDHL+tdohyphMeD9k+af Sdg/ohkahJuoZeCw== From: "tip-bot2 for Ingo Molnar" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/cleanups] timers: Rename __init_timer() as __timer_init() Cc: Ingo Molnar , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20250507175338.672442-5-mingo@kernel.org> References: <20250507175338.672442-5-mingo@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <174672687050.406.11934732105180814170.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the timers/cleanups branch of tip: Commit-ID: 9505215b6b3233d38c5ee65cfd47b6a5a36adab9 Gitweb: https://git.kernel.org/tip/9505215b6b3233d38c5ee65cfd47b6a5a= 36adab9 Author: Ingo Molnar AuthorDate: Wed, 07 May 2025 19:53:32 +02:00 Committer: Thomas Gleixner CommitterDate: Thu, 08 May 2025 19:49:33 +02:00 timers: Rename __init_timer() as __timer_init() Move this API to the canonical __timer_*() namespace. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/all/20250507175338.672442-5-mingo@kernel.org --- include/linux/timer.h | 6 +++--- include/linux/workqueue.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/linux/timer.h b/include/linux/timer.h index 31127e8..11e1fac 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -88,7 +88,7 @@ static inline void timer_init_key_on_stack(struct timer_l= ist *timer, #endif =20 #ifdef CONFIG_LOCKDEP -#define __init_timer(_timer, _fn, _flags) \ +#define __timer_init(_timer, _fn, _flags) \ do { \ static struct lock_class_key __key; \ timer_init_key((_timer), (_fn), (_flags), #_timer, &__key);\ @@ -101,7 +101,7 @@ static inline void timer_init_key_on_stack(struct timer= _list *timer, #_timer, &__key); \ } while (0) #else -#define __init_timer(_timer, _fn, _flags) \ +#define __timer_init(_timer, _fn, _flags) \ timer_init_key((_timer), (_fn), (_flags), NULL, NULL) #define __init_timer_on_stack(_timer, _fn, _flags) \ timer_init_key_on_stack((_timer), (_fn), (_flags), NULL, NULL) @@ -118,7 +118,7 @@ static inline void timer_init_key_on_stack(struct timer= _list *timer, * be used and must be balanced with a call to destroy_timer_on_stack(). */ #define timer_setup(timer, callback, flags) \ - __init_timer((timer), (callback), (flags)) + __timer_init((timer), (callback), (flags)) =20 #define timer_setup_on_stack(timer, callback, flags) \ __init_timer_on_stack((timer), (callback), (flags)) diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index b0dc957..985f69f 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -316,7 +316,7 @@ static inline unsigned int work_static(struct work_stru= ct *work) { return 0; } #define __INIT_DELAYED_WORK(_work, _func, _tflags) \ do { \ INIT_WORK(&(_work)->work, (_func)); \ - __init_timer(&(_work)->timer, \ + __timer_init(&(_work)->timer, \ delayed_work_timer_fn, \ (_tflags) | TIMER_IRQSAFE); \ } while (0)