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 76932480973; Tue, 7 Jul 2026 21:54:43 +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=1783461284; cv=none; b=T09yI7QK1ZG2OPC1ds0LH2LdzQ4eyX49Ral2syJ6ApsUVr2sBge+36geVMUv0DrhQLDq3sTuHT5u1nAe4QgRAES2jA7ikhQoUk14CtvkyVz02EJMfQA12NjmkZLATfMP2Sfp+iofCWUypNugk1cFtZQartvp9+LFkxNykuzQbrY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783461284; c=relaxed/simple; bh=KwbPB7LI5kzxvBRHtEJ7ysiqnThGOjua5SH58D4D2+8=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=HjTaRYT2WhhN1l20Q/k7f9xjdg8ck/4OrgQgKU0Vv2aQ5LTL59N1UnHMWgkSrslJlNyqbLK0aS5bmZoyMGBHW6mzHSKE3lgQkcycQHchldoM3hFtXH9re0xPpxBm2gbrfEHt6FoMxDpQk8U1XbDPCsJugM5AMqgOHnj//L6y3PM= 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=Jr7n4m9x; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=aCIq7plh; 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="Jr7n4m9x"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="aCIq7plh" Date: Tue, 07 Jul 2026 21:54:40 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1783461282; 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=Mqy1jGdBH78RUhFoyAHM4tMGsOyUO4CkP+9dx/BF2KA=; b=Jr7n4m9x7slPbVjjnurmnyWPuEBjWJrrKXMoLOgqf2gz3XrMHJqEe3yKbGZXUPvE2DdFET Rh1vgqAsRnztTPX02oe9Cscpr18HsG82/VwTEmI7xgz6ykD1aA3AFLSetgwIaJ8WULfvuQ VFtwxDQ/FNPBRI3aBCm92PQwc51rXZNQ54md7R5pCc7zXscBRNVfTWyHFzfiasocEzqxOJ tLO/BN3IxgDxrS0PCp/hCCtmVPx4dirltfxHuhjR11HlfyL8oq/aQBiIvkSA2MUCeLbL92 hsQBsAojeNv8xAAEcNmPzGI3XZJyllHtPcx0Xv66eOjp8C12DAoNM8ytPTn0Ig== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1783461282; 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=Mqy1jGdBH78RUhFoyAHM4tMGsOyUO4CkP+9dx/BF2KA=; b=aCIq7plhW2ldyNtbZ0OmTrBoRMYYX+dy5LQU+zRNU35/8VN1cL3m03INbQ6LSwqvJlAjBw pM7CWn0BMUD+IgDQ== 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] MIPS: VDSO: Respect COMPAT_32BIT_TIME Cc: thomas.weissschuh@linutronix.de, Thomas Gleixner , Arnd Bergmann , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260702-vdso-compat_32bit_time-v3-7-db9f36d8d432@linutronix.de> References: <20260702-vdso-compat_32bit_time-v3-7-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: <178346128049.744054.5222621563201402470.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: 377e3f2d41309e55a915f79510db4372f9688c07 Gitweb: https://git.kernel.org/tip/377e3f2d41309e55a915f79510db4372f96= 88c07 Author: Thomas Wei=C3=9Fschuh AuthorDate: Thu, 02 Jul 2026 10:21:31 +02:00 Committer: Thomas Gleixner CommitterDate: Tue, 07 Jul 2026 23:52:53 +02:00 MIPS: 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: Arnd Bergmann Link: https://patch.msgid.link/20260702-vdso-compat_32bit_time-v3-7-db9f36d8d= 432@linutronix.de --- arch/mips/vdso/vdso.lds.S | 2 ++ arch/mips/vdso/vgettimeofday.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/arch/mips/vdso/vdso.lds.S b/arch/mips/vdso/vdso.lds.S index 278ab64..b11ee49 100644 --- a/arch/mips/vdso/vdso.lds.S +++ b/arch/mips/vdso/vdso.lds.S @@ -97,9 +97,11 @@ VERSION LINUX_2.6 { #ifdef CONFIG_GENERIC_GETTIMEOFDAY global: +#if _MIPS_SIM =3D=3D _MIPS_SIM_ABI64 || defined(CONFIG_COMPAT_32BIT_TIME) __vdso_clock_gettime; __vdso_gettimeofday; __vdso_clock_getres; +#endif #if _MIPS_SIM !=3D _MIPS_SIM_ABI64 __vdso_clock_gettime64; __vdso_clock_getres_time64; diff --git a/arch/mips/vdso/vgettimeofday.c b/arch/mips/vdso/vgettimeofday.c index 00f9fcf..a1fb06b 100644 --- a/arch/mips/vdso/vgettimeofday.c +++ b/arch/mips/vdso/vgettimeofday.c @@ -12,6 +12,8 @@ #include =20 #if _MIPS_SIM !=3D _MIPS_SIM_ABI64 + +#ifdef CONFIG_COMPAT_32BIT_TIME int __vdso_clock_gettime(clockid_t clock, struct old_timespec32 *ts) { @@ -29,6 +31,7 @@ int __vdso_clock_getres(clockid_t clock_id, { return __cvdso_clock_getres_time32(clock_id, res); } +#endif /* CONFIG_COMPAT_32BIT_TIME */ =20 int __vdso_clock_gettime64(clockid_t clock, struct __kernel_timespec *ts)