From nobody Mon Sep 28 07:17:28 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 8B9B230F55F; Tue, 25 Aug 2026 01:53:26 +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=1787622808; cv=none; b=KIjJuWXLf5hKBG/p/bREsXQ5jHkBeySzjC5HezI7bHm4xavdZgBLFTORJ92FL7XwThb5i2If2qLR8Kco/liTInxidVj9nYOinW+GRUt+BNBA2ET6D3T9tWQkXolwcAK6g03rKQ1Yd6UUtIdBxOZLV1JitGMnSktlOG7h+ut7ZZs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787622808; c=relaxed/simple; bh=jMVNwjjCefabEGTSZokM2TVbhdb184iLsPWBvLbeoRU=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=Ckthz7T3qu2ZLJUZx3xVgSxc/1/4o2pQwqHpp0ddraLoTgNUxv6uHZ1qM94UzAKqQ/DyWnSaldqEY5TjhOAbUA2/fHhuvbDfVzsaJMQPU96pZvP6r2GTcUNJZJ4LdkoVg6hnYfrlBbnPmnDif+Hue9z3ejIASZuaMpGhEQv8pOY= 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=xMu1B+ZU; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=Svz/8RRt; 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="xMu1B+ZU"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="Svz/8RRt" Date: Tue, 25 Aug 2026 01:53:22 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1787622804; 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=P3zsFEfXtgfL1Un3LTGXq/4K4JeHR2GCFdTZABqOQBk=; b=xMu1B+ZUkti2vQvn3NO8CTWzymmK5GTK2EAOQTWxLgDNoS+nzL1OjjueKfUA7EgEhXDP1m Ab4yeoTitIsfR4gsnulb3WbhRCko6xN4mZdJeEbkSy+a2lgQRTPaQ5rIWgdkFeaIKy/6eN 8HP71RBPPD38jSh6lFoOof13ByVQSzS7NWYq+NkMnVo1HpnTIqpqikUqCD1lR5Wz/vNrO0 G7MQLL4XJoikMEClskQjj29ne2cDr/73B4c208fBSxtGKpXbyCFMLw563W6S7ntTcgqxTi NQhN/M1Hg5tDHvPsHJGwpKzzUdqou18pQD/Z3aQJo5nlVzbZFMPYzv35vr8ZEw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1787622804; 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=P3zsFEfXtgfL1Un3LTGXq/4K4JeHR2GCFdTZABqOQBk=; b=Svz/8RRtdW/O14Z1zI8EBNTVhEjxdY51F7+JZKlvQt/d9t7fGqe/R4u6WgiJf9sEwUqufd WPgSZGVjsoc54/DQ== From: tip-bot2 for Thomas =?utf-8?q?Wei=C3=9Fschuh?= Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/urgent] um: Use asm-generic/timex.h over the host architecture one Cc: thomas.weissschuh@linutronix.de, "Borislav Petkov (AMD)" , David Gow , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260819-uml-timex-fix-v1-1-f690b514fc9f@linutronix.de> References: <20260819-uml-timex-fix-v1-1-f690b514fc9f@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <178762280250.2638944.5769417318338595729.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/urgent branch of tip: Commit-ID: 64f74d8f728877858372c52067e5c0c091f8db24 Gitweb: https://git.kernel.org/tip/64f74d8f728877858372c52067e5c0c09= 1f8db24 Author: Thomas Wei=C3=9Fschuh AuthorDate: Wed, 19 Aug 2026 09:24:21 +02:00 Committer: Borislav Petkov (AMD) CommitterDate: Mon, 24 Aug 2026 17:10:35 -07:00 um: Use asm-generic/timex.h over the host architecture one The removal of the architecture-specific asm/timex.h was meant to fall back= to asm-generic/timex.h. However on UML, the host architecture headers are earl= ier on the include path and therefore asm/timex.h from the host architecture is used. On x86 that header in turn requires the generation of cpufeaturemasks.h, wh= ich is not set up for UML and the build fails. In file included from ../arch/x86/include/asm/tsc.h:9, from ../arch/x86/include/asm/timex.h:6, from ../include/linux/timex.h:67, from ../include/linux/time32.h:13, from ../include/linux/time.h:60, from ../include/linux/jiffies.h:10, from ../include/linux/ktime.h:25, from ../include/linux/timer.h:6, from ../include/linux/uprobes.h:18, from ../include/linux/mm_types.h:16, from ../include/linux/mmzone.h:22, from ../include/linux/gfp.h:7, from ../include/linux/slab.h:17, from ../include/linux/crypto.h:18, from ../arch/um/kernel/asm-offsets.c:6: arch/x86/include/asm/tsc.h: In function =E2=80=98get_cycles=E2=80=99: arch/um/include/asm/cpufeature.h:52:39: error: implicit declaration of fu= nction =E2=80=98DISABLED_MASK_BIT_SET=E2=80=99 [-Wimplicit-function-declara= tion] 52 | (__builtin_constant_p(bit) && DISABLED_MASK_BIT_SET(bit) = ? 0 : _static_cpu_has(bit)) | ^~~~~~~~~~~~~~~~~~~~~ arch/x86/include/asm/tsc.h:79:14: note: in expansion of macro =E2=80=98cp= u_feature_enabled=E2=80=99 79 | if (!cpu_feature_enabled(X86_FEATURE_TSC)) | ^~~~~~~~~~~~~~~~~~~ arch/um/include/asm/cpufeature.h:115:17: error: implicit declaration of f= unction =E2=80=98_static_cpu_has=E2=80=99 [-Wimplicit-function-declaration] 115 | _static_cpu_has(bit) \ | ^~~~~~~~~~~~~~~ ... The x86-specific timex.h also doesn't make sense on UML in general. Reintroduce the UML-specific asm/timex.h and add a comment to document its necessity. [ bp: Improve that comment to actually state why stuff is there. ] Fixes: 3ed403bbc967 ("treewide: Remove CLOCK_TICK_RATE") Signed-off-by: Thomas Wei=C3=9Fschuh Signed-off-by: Borislav Petkov (AMD) Reviewed-by: David Gow Link: https://patch.msgid.link/20260819-uml-timex-fix-v1-1-f690b514fc9f@lin= utronix.de --- arch/um/include/asm/timex.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 arch/um/include/asm/timex.h diff --git a/arch/um/include/asm/timex.h b/arch/um/include/asm/timex.h new file mode 100644 index 0000000..39e392e --- /dev/null +++ b/arch/um/include/asm/timex.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __UM_TIMEX_H +#define __UM_TIMEX_H + +/* + * Do not fall back to the host architecture header because latter likely + * includes facilities like cpu_feature_enabled() which are present only + * there. That would result in build breakages and/or efforts to "emulate" + * those facilities in UML. + */ +#include + +#endif