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 35CBF480350; Tue, 7 Jul 2026 21:54:41 +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=1783461283; cv=none; b=LEA4GFiyfLdyqtswAPfD7SI0vvABIGZ7U/LOZoudzhuSgPPiE0dIDJdHzScn5mQOk73SLCZb6rYxgUSfz7vwDi4HKFbpU7WdiS5Px1RdfZcfDjLcKq3b/6DgMYxn8WvQb6Rm/iVy5N0W4u5M94hkl0qA1Yuhiiz/8sQJSSttqPo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783461283; c=relaxed/simple; bh=W3P40MgBO357BU0xcrlxIvOlCYiS2aG7Znwtt8uqqZ0=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=jHFRMUARqQ6F9Cz9kmic6Llx6gr0yNjrlrQO0DW8jeSMxOjfVD+Bx5y5DKvsNZzWz4Lxu+AKn1DZBBiz1Osva3DkpLgnNXDXtPPKcwp6KMgBUypD7i4FtCAqmj0NRgdP6wkPVDvsByT+u+G8LdcEH2DiiyztDTWuBHBdGnD26LQ= 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=STXVtyx2; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=tNiOi5oO; 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="STXVtyx2"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="tNiOi5oO" Date: Tue, 07 Jul 2026 21:54:39 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1783461280; 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=Fh58MMKVyaavzpShbEu1F9haoCqv9raiHQ5HQtmC3eE=; b=STXVtyx22/F2NrP258LIT26Sqa5xQADUQIqvoKkxm/7yqv5hY7AYAAJmaV4/fTzpxskrnX kEq3Oai89N5L0rUbo/qq8b+hAL0KkL4213FlIZfPtqY4bs9+JqCFBZqZKIORaXXNRPVN+n VX59oSDJTYf8UR33cT5ZZYECwNnZsA/kivBcjkxlVDASUoAd0d6yTKQ6z7u3TbsvAdouKH XaCLetNS46cwsPBaCGqtW6DGtxZg4V4s9/gUxfTkK90IxEIHNI+qebJLSYcyme4FGrvSzc TYd6rQsfLxs5+eMt206YoxT75B6ZZI1ct0QPVQro559nbvm12Gafru0FMNMD8w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1783461280; 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=Fh58MMKVyaavzpShbEu1F9haoCqv9raiHQ5HQtmC3eE=; b=tNiOi5oOBNJW+xbUPi1G8o2TH8Qh5DQH71cFhmJDmWtSK/HpHD6cngXr29qoGIQZORAuhI wrs5qqyyCCF6TNCg== 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] sparc: 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-8-db9f36d8d432@linutronix.de> References: <20260702-vdso-compat_32bit_time-v3-8-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: <178346127903.744054.6596418527902810308.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: 2700297b69fe146a14c44f3d7a78771269f160d2 Gitweb: https://git.kernel.org/tip/2700297b69fe146a14c44f3d7a78771269f= 160d2 Author: Thomas Wei=C3=9Fschuh AuthorDate: Thu, 02 Jul 2026 10:21:32 +02:00 Committer: Thomas Gleixner CommitterDate: Tue, 07 Jul 2026 23:52:53 +02:00 sparc: 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-8-db9f36d8d= 432@linutronix.de --- arch/sparc/vdso/vclock_gettime.c | 4 ++++ arch/sparc/vdso/vdso32/vdso32.lds.S | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/sparc/vdso/vclock_gettime.c b/arch/sparc/vdso/vclock_gettim= e.c index 1d98593..221bd4e 100644 --- a/arch/sparc/vdso/vclock_gettime.c +++ b/arch/sparc/vdso/vclock_gettime.c @@ -21,6 +21,7 @@ =20 #include "../../../../lib/vdso/gettimeofday.c" =20 +#if defined(CONFIG_SPARC64) || defined(CONFIG_COMPAT_32BIT_TIME) int __vdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz) { return __cvdso_gettimeofday(tv, tz); @@ -28,6 +29,7 @@ int __vdso_gettimeofday(struct __kernel_old_timeval *tv, st= ruct timezone *tz) =20 int gettimeofday(struct __kernel_old_timeval *, struct timezone *) __weak __alias(__vdso_gettimeofday); +#endif =20 #if defined(CONFIG_SPARC64) int __vdso_clock_gettime(clockid_t clock, struct __kernel_timespec *ts) @@ -40,6 +42,7 @@ int clock_gettime(clockid_t, struct __kernel_timespec *) =20 #else =20 +#if defined(CONFIG_COMPAT_32BIT_TIME) int __vdso_clock_gettime(clockid_t clock, struct old_timespec32 *ts) { return __cvdso_clock_gettime32(clock, ts); @@ -47,6 +50,7 @@ int __vdso_clock_gettime(clockid_t clock, struct old_timesp= ec32 *ts) =20 int clock_gettime(clockid_t, struct old_timespec32 *) __weak __alias(__vdso_clock_gettime); +#endif =20 int __vdso_clock_gettime64(clockid_t clock, struct __kernel_timespec *ts) { diff --git a/arch/sparc/vdso/vdso32/vdso32.lds.S b/arch/sparc/vdso/vdso32/vds= o32.lds.S index a14e4f7..2805216 100644 --- a/arch/sparc/vdso/vdso32/vdso32.lds.S +++ b/arch/sparc/vdso/vdso32/vdso32.lds.S @@ -15,12 +15,14 @@ VERSION { LINUX_2.6 { global: +#ifdef CONFIG_COMPAT_32BIT_TIME clock_gettime; __vdso_clock_gettime; - clock_gettime64; - __vdso_clock_gettime64; gettimeofday; __vdso_gettimeofday; +#endif + clock_gettime64; + __vdso_clock_gettime64; local: *; }; }