From nobody Sun Feb 8 04:23:34 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 B62572874F2; Thu, 8 May 2025 17:54:33 +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=LjknHWzVSs6uWZ4WHafFH5ZZqlFhlmQCou/WVglBFuao5yTH7qY3KduDj4fYpR3qdlEGtZUqRMNyW/0PUkr+Dr2edGu6M3RgyWXiYfzNU4MTpuhlnHK4u8B3XuS7xmZEiKp/XHFKM0pYkhngFxKKR/MUj5tBN4xucgW38eeHhEA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746726875; c=relaxed/simple; bh=2lwvKcUE+PMLUB7hJBK1+Ks9JdwuCLumvSaQ9s7Cuq8=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=ARBVO6pY0cBTfwNRIIrCKXnj4fpf/j/dsEpQVbI5jGLFjJdS8Jyk+cwkmRBOCDhUcC/HZGXbVNmC2iI8B6naZWphtE7IoSTo8qrZhqQa+vvyte5rC0+laZv10JSWh9r+MnPUbiGMNNITYUSe5/0/K/gY+RfIxWPRm9ENAAMZ5e4= 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=KROi6pms; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=5sY1unan; 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="KROi6pms"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="5sY1unan" Date: Thu, 08 May 2025 17:54:31 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1746726872; 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=7nzlg0TQGxkJHRFgwLUxfINQlQrmwTk5jak6qBU77UE=; b=KROi6pmsSTkpRfvV+jbWow7lsTEwkJoA49Ti9vK0lKxotzjUGgYiQNhDdm3sp/1ItAAJMM ZrFkFd3o2Lve3FPd2q8PhJxOiulds70oDTyuRXXADRH0bL6OZRs+W7oSO6ek3WQyY5QEDU cdDrAghbnXvGaHMJ1j2Qlna2PO4/8qwLD+v7UKOjaH878JBRwxdtxS1aa8WpH8ZrrgiuYB L9SfOSdRIMTFmix5Vhl/bi0G5ZmK1zeotM9D4R8UAZt30e5oX+OK6iH4V9x/Op1KO3U2bI jtNtNDEbszS+zlw2iuqTeQXouj1XHNuxrykhvdRlW4gbhZkOASJLuSKGPhL9tQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1746726872; 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=7nzlg0TQGxkJHRFgwLUxfINQlQrmwTk5jak6qBU77UE=; b=5sY1unan1SHhi+RIBIYFY/ASyTnkM6D++VB+I9+Om49hhGznklRYI2PbYfxIQfDo9zeS2I TcOhaDL+hsv6gyDw== 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_on_stack_key() as timer_init_key_on_stack() Cc: Ingo Molnar , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20250507175338.672442-4-mingo@kernel.org> References: <20250507175338.672442-4-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: <174672687124.406.10514775691786482232.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: 7879d10de3318af0b7893d1efc9d7654cd4ac1a6 Gitweb: https://git.kernel.org/tip/7879d10de3318af0b7893d1efc9d7654c= d4ac1a6 Author: Ingo Molnar AuthorDate: Wed, 07 May 2025 19:53:31 +02:00 Committer: Thomas Gleixner CommitterDate: Thu, 08 May 2025 19:49:32 +02:00 timers: Rename init_timer_on_stack_key() as timer_init_key_on_stack() 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-4-mingo@kernel.org --- include/linux/timer.h | 8 ++++---- kernel/time/timer.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/linux/timer.h b/include/linux/timer.h index 0c1c3aa..31127e8 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -72,12 +72,12 @@ void timer_init_key(struct timer_list *timer, const char *name, struct lock_class_key *key); =20 #ifdef CONFIG_DEBUG_OBJECTS_TIMERS -extern void init_timer_on_stack_key(struct timer_list *timer, +extern void timer_init_key_on_stack(struct timer_list *timer, void (*func)(struct timer_list *), unsigned int flags, const char *name, struct lock_class_key *key); #else -static inline void init_timer_on_stack_key(struct timer_list *timer, +static inline void timer_init_key_on_stack(struct timer_list *timer, void (*func)(struct timer_list *), unsigned int flags, const char *name, @@ -97,14 +97,14 @@ static inline void init_timer_on_stack_key(struct timer= _list *timer, #define __init_timer_on_stack(_timer, _fn, _flags) \ do { \ static struct lock_class_key __key; \ - init_timer_on_stack_key((_timer), (_fn), (_flags), \ + timer_init_key_on_stack((_timer), (_fn), (_flags), \ #_timer, &__key); \ } while (0) #else #define __init_timer(_timer, _fn, _flags) \ timer_init_key((_timer), (_fn), (_flags), NULL, NULL) #define __init_timer_on_stack(_timer, _fn, _flags) \ - init_timer_on_stack_key((_timer), (_fn), (_flags), NULL, NULL) + timer_init_key_on_stack((_timer), (_fn), (_flags), NULL, NULL) #endif =20 /** diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 5efed36..6f520e5 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -850,7 +850,7 @@ static void do_init_timer(struct timer_list *timer, unsigned int flags, const char *name, struct lock_class_key *key); =20 -void init_timer_on_stack_key(struct timer_list *timer, +void timer_init_key_on_stack(struct timer_list *timer, void (*func)(struct timer_list *), unsigned int flags, const char *name, struct lock_class_key *key) @@ -858,7 +858,7 @@ void init_timer_on_stack_key(struct timer_list *timer, debug_object_init_on_stack(timer, &timer_debug_descr); do_init_timer(timer, func, flags, name, key); } -EXPORT_SYMBOL_GPL(init_timer_on_stack_key); +EXPORT_SYMBOL_GPL(timer_init_key_on_stack); =20 void destroy_timer_on_stack(struct timer_list *timer) {