From mboxrd@z Thu Jan 1 00:00:00 1970 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 5A57748094D; Tue, 7 Jul 2026 21:54:47 +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=1783461296; cv=none; b=URrYjh+QkK6F+++sNwp6g1wNYiDFbzl9Ez5dPIwrB3VAxaMAE9bFaK5XwqwH+gxYqTMTrWbU7hvNCxoLFx1J+Vj2TniBTU+qQSH+doGe00jz9k+Di7MV/+yS0wOtjHKHtc8E1Oz52aQDs6dPwT6XNzpvE3x17yfCAmV7/GN1UmI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783461296; c=relaxed/simple; bh=89ZF3vy8mOyH+B8hk04WgDNGKgou7AhYuMPcVtaF6/4=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=jTYjj+y5ShWrxXWKmzdY2SkBMNZrxGgcG7EVK0Bmineij37OpTQ6d4emrBn3WEQCxV+Ich2FAqdtXgEue7kgusPXE+BizTtB4yGMqVHqinNaREFs2rzN1oikQGV+v3Okl2HepLH8MKKiz3/wxclFiNqcQ/i2UmFG2ZIlV3CzTnw= 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=oxDQlszu; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=Fe5Zlra8; 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="oxDQlszu"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="Fe5Zlra8" Date: Tue, 07 Jul 2026 21:54:44 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1783461286; 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=vUX5kgSQSK6dk/Zo/a0ugmFbysmHTNj4My0HZSKzap0=; b=oxDQlszuwASCeiGLYS5L7NAN+ljhHBaJWoVUirjXrs4PgUflcjumYxSsJKorofDSuAkUjY xJ/SmktKEWMk+Wl4dKOwKqCkfAXLKtVoC3Go3lr/bKoGc3wtZ8BlSQLLurksWtySdp3TAd l039tI7RIcMltsOIPNDaMJpJWAZoVGEmzc4AkSij6dqcOhR8yLV7uUjLSnfzN94ijpFmNA LYlB8pItZBcyw7MWUNtQSu6Bs0JNG62xMFL/NYvrJQbSk6L1MIcVov8c05Mc5hsdiCzj1z kywcca9pFOQC41rjhGYvpQjPN1+9F1WAPnPSFPCOgTfbU+D4MJF2ZydcI+zfvg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1783461286; 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=vUX5kgSQSK6dk/Zo/a0ugmFbysmHTNj4My0HZSKzap0=; b=Fe5Zlra8FUoeXOv0QNG1l6xzJzSaXX4bamuvFoOSog8zmdhyFcD1H9u0MCsmf81Ug8xaGs vvQq1Emdynhe7wDA== 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/vdso] arm64: vdso32: Respect COMPAT_32BIT_TIME Cc: thomas.weissschuh@linutronix.de, Thomas Gleixner , philmd@oss.qualcomm.com, Arnd Bergmann , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260702-vdso-compat_32bit_time-v3-4-db9f36d8d432@linutronix.de> References: <20260702-vdso-compat_32bit_time-v3-4-db9f36d8d432@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <178346128458.744054.16287896851859093686.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/vdso branch of tip: Commit-ID: abb1537388baf8d872370deb3a07e1afccfa4e61 Gitweb: https://git.kernel.org/tip/abb1537388baf8d872370deb3a07e1afccf= a4e61 Author: Thomas Wei=C3=9Fschuh AuthorDate: Thu, 02 Jul 2026 10:21:28 +02:00 Committer: Thomas Gleixner CommitterDate: Tue, 07 Jul 2026 23:52:53 +02:00 arm64: vdso32: Respect COMPAT_32BIT_TIME If CONFIG_COMPAT_32BIT_TIME is disabled then the vDSO should not provide any 32-bit time related functionality. This is the intended effect of the kconfig option and also the fallback system calls would also not be implemented. Signed-off-by: Thomas Wei=C3=9Fschuh Signed-off-by: Thomas Gleixner Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Arnd Bergmann Link: https://patch.msgid.link/20260702-vdso-compat_32bit_time-v3-4-db9f36d8d= 432@linutronix.de --- arch/arm64/kernel/vdso32/vdso.lds.S | 2 ++ arch/arm64/kernel/vdso32/vgettimeofday.c | 14 ++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kernel/vdso32/vdso.lds.S b/arch/arm64/kernel/vdso32/v= dso.lds.S index c374fb0..12bfc39 100644 --- a/arch/arm64/kernel/vdso32/vdso.lds.S +++ b/arch/arm64/kernel/vdso32/vdso.lds.S @@ -82,9 +82,11 @@ VERSION { LINUX_2.6 { global: +#ifdef CONFIG_COMPAT_32BIT_TIME __vdso_clock_gettime; __vdso_gettimeofday; __vdso_clock_getres; +#endif /* CONFIG_COMPAT_32BIT_TIME */ __vdso_clock_gettime64; __vdso_clock_getres_time64; local: *; diff --git a/arch/arm64/kernel/vdso32/vgettimeofday.c b/arch/arm64/kernel/vds= o32/vgettimeofday.c index 0c6998e..12d0255 100644 --- a/arch/arm64/kernel/vdso32/vgettimeofday.c +++ b/arch/arm64/kernel/vdso32/vgettimeofday.c @@ -8,16 +8,17 @@ #define BUILD_VDSO32_64 #include =20 +#ifdef CONFIG_COMPAT_32BIT_TIME int __vdso_clock_gettime(clockid_t clock, struct old_timespec32 *ts) { return __cvdso_clock_gettime32(clock, ts); } =20 -int __vdso_clock_gettime64(clockid_t clock, - struct __kernel_timespec *ts) +int __vdso_clock_getres(clockid_t clock_id, + struct old_timespec32 *res) { - return __cvdso_clock_gettime(clock, ts); + return __cvdso_clock_getres_time32(clock_id, res); } =20 int __vdso_gettimeofday(struct __kernel_old_timeval *tv, @@ -25,11 +26,12 @@ int __vdso_gettimeofday(struct __kernel_old_timeval *tv, { return __cvdso_gettimeofday(tv, tz); } +#endif /* CONFIG_COMPAT_32BIT_TIME */ =20 -int __vdso_clock_getres(clockid_t clock_id, - struct old_timespec32 *res) +int __vdso_clock_gettime64(clockid_t clock, + struct __kernel_timespec *ts) { - return __cvdso_clock_getres_time32(clock_id, res); + return __cvdso_clock_gettime(clock, ts); } =20 int __vdso_clock_getres_time64(clockid_t clock_id, struct __kernel_timespec = *res)