From nobody Mon Jun 8 05:26:56 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 8D7B61CAA65; Tue, 2 Jun 2026 19:46:49 +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=1780429610; cv=none; b=iyDhcU2zdRFyuCPF2QAn//76TEGXL2QrdBvqjF2ZolVG44bKZP90URE8Kq7aIQg52XsHvQwe/eD6YV/b3BzFb/O9vs70IPGnKoYCIm3Z7ZrI5CNcHfC6Ikojsw039vStjyRoFORg9NBJiGw0n/I2uRRES+lkdE9kC32AK5nryrc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780429610; c=relaxed/simple; bh=lNkswLj3jzy0nmzZkF9U5LbTZWXBhUB5+sHhgzm7LOg=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=eNgzAG2Ss9WtB7buCn9pnEULK+Lh1Gd/8RB/uL9kb+wVEmK7H9hZTFw3IcJvVoUVshec8kw/ZcZlZ9UyNAcEVLeVAilgO+zGSFq2DA8qRCDj1mZ5QMAql3qn0m+VV1gRHUUSSXT1SNUdCJLFnYkWIF41aFRJErPLRdU7a97aUhw= 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=G25acaeI; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=120VZ7dh; 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="G25acaeI"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="120VZ7dh" Date: Tue, 02 Jun 2026 19:46:46 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1780429608; 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=iv8kn4kpK9e6zBdrMjV9W7IgwnUrdiCNq2tod8NeT2I=; b=G25acaeI1HatvF6PKAlP6CeX2XKS93XupIe7hzpmpNKKYZYZS+pw4+jZ/Av2viIYpDNX/F wpBfCWG2TPdwB8Pl4ZRk457r1fLT7vbgtehmQ8zsLiZaC+wbKUjw2TDgmX0rJLDLZZjUlb nveB2fxg/6G3dyFWsRRqv9cw6mvCm+HRe6qalkVHCLwgcqm9zwH/G/EMZceFr2IEC/Ke0e R6ro9bNP0CovdDdKsTR9rq5KqAFsXXbdC/s6iG2nK6QHeSklmyDShdx2nYOHEomaV2ZVZZ qX/U1ebmJrncTrUxu3queP0SR8rnrSEjIugWgGnCj9H/OI0PmjoUcwERvf77Iw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1780429608; 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=iv8kn4kpK9e6zBdrMjV9W7IgwnUrdiCNq2tod8NeT2I=; b=120VZ7dhXMy5VMug8Ow9VOtFf982OLazCu10ZQ4ANJc7M7csMvFRyZttQrROirGf/NoeqP 1oVHVuXWWG0quFCw== 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] vdso/vsyscall: Gate update_vsyscall() behind CONFIG_GENERIC_GETTIMEOFDAY Cc: thomas.weissschuh@linutronix.de, Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260519-vdso-generic_time_vsyscal-v1-2-5c2a5905d5f5@linutronix.de> References: <20260519-vdso-generic_time_vsyscal-v1-2-5c2a5905d5f5@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <178042960681.710.2380227102618463660.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: bf8f968a63159661acc20254ccdf0dc3c9f1bac2 Gitweb: https://git.kernel.org/tip/bf8f968a63159661acc20254ccdf0dc3c= 9f1bac2 Author: Thomas Wei=C3=9Fschuh AuthorDate: Tue, 19 May 2026 08:26:16 +02:00 Committer: Thomas Gleixner CommitterDate: Tue, 02 Jun 2026 21:41:23 +02:00 vdso/vsyscall: Gate update_vsyscall() behind CONFIG_GENERIC_GETTIMEOFDAY Both the compilation of kernel/time/vsyscall.c, which contains the real definition of update_vsyscall() and the other vDSO definitions in timekeeper_internal.h use CONFIG_GENERIC_GETTIMEOFDAY and not CONFIG_GENERIC_TIME_VSYSCALL. Align the code to use a single Kconfig symbol. Signed-off-by: Thomas Wei=C3=9Fschuh Signed-off-by: Thomas Gleixner Link: https://patch.msgid.link/20260519-vdso-generic_time_vsyscal-v1-2-5c2a= 5905d5f5@linutronix.de --- include/linux/timekeeper_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper= _internal.h index e36d11e..4486dfd 100644 --- a/include/linux/timekeeper_internal.h +++ b/include/linux/timekeeper_internal.h @@ -190,7 +190,7 @@ struct timekeeper { s32 tai_offset; }; =20 -#ifdef CONFIG_GENERIC_TIME_VSYSCALL +#ifdef CONFIG_GENERIC_GETTIMEOFDAY =20 extern void update_vsyscall(struct timekeeper *tk); extern void update_vsyscall_tz(void);