From nobody Wed Apr 1 20:46:05 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 F3A2E478E4A; Wed, 1 Apr 2026 16:49:51 +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=1775062193; cv=none; b=Tllcks81lpDEQClltsRxEZtCvpGxvcZXF4qUMY1WAM1gbXf9PLu9u5QSaUHHWLZjh+8+w48QapJ3u7g6O9k/W28K4PgJkym9jjI9HnD8zhAZGfaP3IcpAWwbY3fT98XSRLw5d+7fGr1hD34WGSohauBH6tOckevSO3+M0/S8WFI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775062193; c=relaxed/simple; bh=8r0DKP/m08A3OtsX+BRjO+BBdWGKOYnZ4nKgJkZvENE=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=etLapfj4vw2AZbl4Mglh2/RPa+rmn2o16wUnQWIruzdvhY1BUOPPwyoYGu46uSyOELhs6+8AQ6uC9RUDyKSqREbandSumcdOmT/OrI8LMQjDgcqKLz3MWzOFoRa/4I/dJAVTENsLw1DCC3UaODrMrXOgm1piQ8mzJADGXIJm0Co= 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=kPzJOCh2; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=qiUJ6rtZ; 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="kPzJOCh2"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="qiUJ6rtZ" Date: Wed, 01 Apr 2026 16:49:48 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1775062190; 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=Q72MrIrMh6JFAabMo/qy5/yiG33y782/ULA3nDbipDk=; b=kPzJOCh2sWx1F+o4iUNtD8GUXSi2M7Zzaktyvwue81iQJUai44lywxHVRMftSI76IDFnhW RlQuHi3UP81Zb9GePO5kfC8tjFoXLHNN86kzl9cq/wcE3H/JdPgkeRkSZFR+4a1xJAFzhP 2R7f+cIH8m/cCxlt/ynXJfm7PkI5Yhxb9P9/23NVG5JIxJ7xl6IPBPCnefhdWcXJP2M6KM Ve64+kbmWKVopZSl2s6zDpL3eiU2lqmz2us1NMQ9u4+vYX0ccpQbelOesF599QvtCX2NAJ pxNDnN/skRLtuJqHmgWbXPjrU+BTujm3Ompbhl6As2j7/HIYc3mGNCqHsIxELA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1775062190; 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=Q72MrIrMh6JFAabMo/qy5/yiG33y782/ULA3nDbipDk=; b=qiUJ6rtZ++QSVoA4uqdtzCIoV1ixf4fKQmonKAuNbOseT5Vc0BlfVpE2jvmWlXge7CwT0O z59pRFiKC1ovaqDQ== From: "tip-bot2 for Zhan Xusheng" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/core] hrtimer: Fix incorrect #endif comment for BITS_PER_LONG check Cc: Zhan Xusheng , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260331074811.26147-1-zhanxusheng@xiaomi.com> References: <20260331074811.26147-1-zhanxusheng@xiaomi.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <177506218838.1647592.989826469059486349.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/core branch of tip: Commit-ID: c5283a1ffdd5a877120279d164e9d5761e8455af Gitweb: https://git.kernel.org/tip/c5283a1ffdd5a877120279d164e9d5761= e8455af Author: Zhan Xusheng AuthorDate: Tue, 31 Mar 2026 15:48:11 +08:00 Committer: Thomas Gleixner CommitterDate: Wed, 01 Apr 2026 18:48:15 +02:00 hrtimer: Fix incorrect #endif comment for BITS_PER_LONG check The #endif comment says "BITS_PER_LONG >=3D 64", but the corresponding #if guard is "BITS_PER_LONG < 64". The comment was originally correct when the block had a three-way #if/#else/#endif structure, where the #else branch provided a 64-bit inline version. Commit 79bf2bb335b8 ("[PATCH] tick-management: dyntick / highres functionality") removed the #else branch but did not update the #endif comment, leaving it inconsistent with the remaining #if condition. Fix the comment to match the preprocessor guard. Signed-off-by: Zhan Xusheng Signed-off-by: Thomas Gleixner Link: https://patch.msgid.link/20260331074811.26147-1-zhanxusheng@xiaomi.com --- kernel/time/hrtimer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index 2db171b..000fb6b 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -355,7 +355,7 @@ s64 __ktime_divns(const ktime_t kt, s64 div) return dclc < 0 ? -tmp : tmp; } EXPORT_SYMBOL_GPL(__ktime_divns); -#endif /* BITS_PER_LONG >=3D 64 */ +#endif /* BITS_PER_LONG < 64 */ =20 /* * Add two ktime values and do a safety check for overflow: