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 1A9C9480DF2; Tue, 7 Jul 2026 21:54:45 +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=1783461295; cv=none; b=FSsJWHR5ubnTFXRkv7Iw96EO8QYic+w+fYBZmsfoC98TFvTEUa/+W7pLasdjZzk19AySv5I+zaQwwzvZSH6CfP/B+lbl2BxbnJSF+HHuYA4j1VqSXtorKPQetJi9h6g6Xz78eb3DUKRN1xPGlA02Qo210rSxBnrt5NgjJPmvE04= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783461295; c=relaxed/simple; bh=bI+Nb+kXAT5ViW07Wltt5fPs6/DCy32ZFFWYCq9GSus=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=rnrYOdvXUIxct4DbZ+8ZJ8pqM+4rsRo/s+Ye2B86KXNqXnqz+/4iMQYN4+1xEbEn5jIYiCcK7GcZ3+bK+fb+xRAJjZeF7ygpWVvmZsewQJhSwo2nLDa1FcAe5b1uye3+HMdJBrELOJcsQ3mi1eoEoo8+a2EVKhxLifLjxwbIErs= 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=4Qg4pffg; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=apKvCoYm; 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="4Qg4pffg"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="apKvCoYm" Date: Tue, 07 Jul 2026 21:54:43 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1783461284; 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=PK3tFDnn4w4WYof6Me8CWaaYOA19UWhKCpuBgOUHff8=; b=4Qg4pffgIvmehQWZ6AzW985Sysj81SQhJuS0TKoDbTOGLWsC6mOW9vQH6jwdXt+r/TBwPk 8O8SFdQmuoKYUryrB6tFa8OtOyKXM1TDiw4rXOZ4sh1XdcgItTzd15CxrluPQDJKvVUwBo 1GdZ4YwFcfkMZ/0OMxUNnT66MzA27wWkPCSHvolhDhaJ/BR35lRbe9QPj712Q2B3HlXFlg MB2xIbnuyHEbojJpNq+csvnJDDKI1nzieLd/TuLnPS7GGeWsof+v2YB8RZyevdArntzwUr 4RU0HSN4JkgV0nW8sz1zCWkOQ0VjHF9IxCgpiNK3wJRRpLvB94PRP7mzQm1rVQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1783461284; 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=PK3tFDnn4w4WYof6Me8CWaaYOA19UWhKCpuBgOUHff8=; b=apKvCoYmARNKTNM7IZIoj2ZsTjRN75EGo8lYdosKe4JlNYONcZJ+MhR9FB+PRpYP3WWoTj KPzvPBQEaQeP/vAg== 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] ARM: VDSO: 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-5-db9f36d8d432@linutronix.de> References: <20260702-vdso-compat_32bit_time-v3-5-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: <178346128324.744054.7317040985878489314.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: 95216f4647e7828de5d9d3a69978e7b8ba21e700 Gitweb: https://git.kernel.org/tip/95216f4647e7828de5d9d3a69978e7b8ba2= 1e700 Author: Thomas Wei=C3=9Fschuh AuthorDate: Thu, 02 Jul 2026 10:21:29 +02:00 Committer: Thomas Gleixner CommitterDate: Tue, 07 Jul 2026 23:52:53 +02:00 ARM: VDSO: 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-5-db9f36d8d= 432@linutronix.de --- arch/arm/vdso/vdso.lds.S | 2 ++ arch/arm/vdso/vgettimeofday.c | 14 ++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/arch/arm/vdso/vdso.lds.S b/arch/arm/vdso/vdso.lds.S index 74d8d8b..e61038c 100644 --- a/arch/arm/vdso/vdso.lds.S +++ b/arch/arm/vdso/vdso.lds.S @@ -70,9 +70,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/arm/vdso/vgettimeofday.c b/arch/arm/vdso/vgettimeofday.c index f7a2f5d..3eebedd 100644 --- a/arch/arm/vdso/vgettimeofday.c +++ b/arch/arm/vdso/vgettimeofday.c @@ -10,16 +10,17 @@ #include #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, @@ -27,11 +28,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)