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 F11D948A2CD; Tue, 7 Jul 2026 21:54:59 +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=1783461304; cv=none; b=ambsf5/JqahDt7sKvJNYXZgieOf0x/6IbqxxtVkII7tDfbe8yDUsKODhMEjO4AWzsw7yGwlaNv1bsVG5MM1lTFxxaLttJthINXFol0NYj7Nt64iMWRMr1wJtKqnzSoOf1UFNqmGt1hAq3/6glXq/s4EWIDywGZWclAN3yw09yrE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783461304; c=relaxed/simple; bh=Ww5KxMzMJfhB/y9WacdT2X8ei6I+WgBSLTMFVD6X25o=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=cx60UzA3P05RrHbLMamPIq6UQECyY/jfKkuMozwqBB2271LG77CadfeHIjoslQvjkxBNDg/yIqBtgYgB2x84WxBhbpiJxXtX6OOykOknwqoq8sB9oKcvaRZNWveHVf/ySZPpC/ae/Z7zG0Ig45Z/R2k8U7ufSRdryBls+IQoOAY= 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=Wp2e67lX; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=s6N6cvth; 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="Wp2e67lX"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="s6N6cvth" Date: Tue, 07 Jul 2026 21:54:56 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1783461298; 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=3LlKE8eDBzHxpRV+ijiOj6BDHDIME9UxoJrwRi/d0Tw=; b=Wp2e67lXjFAmHTmCpTfKTwsImbc7vWfepkuRj//GSuSyps8KiznqXXsu7hLIwfJvQVnPz/ E357bIp6AxJyoYMy5QtOLi3NLKQ0IrzAxyRWASJXjDXv6LKLOy5jVAx6pTJFohDKnxaA9/ Sup3L7De2Ssz1RDRxA0Gfw+1G6O8KSM4NBYTw6JlrQVlw+8PCeq3qHA8mfTwKVYDtYYF80 EzbDvlKfhO5F8kkHQx3dHOrgDA+iGcV6DXDOcKnTPmsHfF40r6ffbJA6+DNdO0N8PY7xzx rjUIIIsmRemvV/vB2JA3S1svrdkZNxfm3+S4pR93oyif2UnduuxWPTnGEnajTA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1783461298; 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=3LlKE8eDBzHxpRV+ijiOj6BDHDIME9UxoJrwRi/d0Tw=; b=s6N6cvthQ5YQucEJYH+U12NPQTIQTTV6eQ77H0/7p3f7gwqB2HfKPIQOsixt+mXbwY3Dwt +7rEFcn92HKgdGDg== 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/datastore: Rename data pages variable Cc: thomas.weissschuh@linutronix.de, Thomas Gleixner , Nam Cao , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260630-vdso-mlockall-v4-1-6c93708ce723@linutronix.de> References: <20260630-vdso-mlockall-v4-1-6c93708ce723@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <178346129693.744054.11181226058471172936.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: ff868f43eb8faf77498efcb206b721e406714e3e Gitweb: https://git.kernel.org/tip/ff868f43eb8faf77498efcb206b721e4067= 14e3e Author: Thomas Wei=C3=9Fschuh AuthorDate: Tue, 30 Jun 2026 09:31:55 +02:00 Committer: Thomas Gleixner CommitterDate: Tue, 07 Jul 2026 23:52:52 +02:00 vdso/datastore: Rename data pages variable An upcoming change will make this a file-scoped variable, for which it should have a clearer name. Rename the variable to prepare for that. Signed-off-by: Thomas Wei=C3=9Fschuh Signed-off-by: Thomas Gleixner Tested-by: Nam Cao Link: https://patch.msgid.link/20260630-vdso-mlockall-v4-1-6c93708ce723@linut= ronix.de --- lib/vdso/datastore.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/vdso/datastore.c b/lib/vdso/datastore.c index 17d37b8..7f78a32 100644 --- a/lib/vdso/datastore.c +++ b/lib/vdso/datastore.c @@ -32,7 +32,7 @@ struct vdso_arch_data *vdso_k_arch_data __ro_after_init =3D void __init vdso_setup_data_pages(void) { unsigned int order =3D get_order(VDSO_NR_PAGES * PAGE_SIZE); - struct page *pages; + struct page *vdso_data_pages; =20 /* * Allocate the data pages dynamically. SPARC does not support mapping @@ -42,24 +42,24 @@ void __init vdso_setup_data_pages(void) * Do not use folios. In time namespaces the pages are mapped in a differen= t order * to userspace, which is not handled by the folio optimizations in finish_= fault(). */ - pages =3D alloc_pages(GFP_KERNEL, order); - if (!pages) + vdso_data_pages =3D alloc_pages(GFP_KERNEL, order); + if (!vdso_data_pages) panic("Unable to allocate VDSO storage pages"); =20 /* The pages are mapped one-by-one into userspace and each one needs to be = refcounted. */ - split_page(pages, order); + split_page(vdso_data_pages, order); =20 /* Move the data already written by other subsystems to the new pages */ - memcpy(page_address(pages), vdso_initdata, VDSO_NR_PAGES * PAGE_SIZE); + memcpy(page_address(vdso_data_pages), vdso_initdata, VDSO_NR_PAGES * PAGE_S= IZE); =20 if (IS_ENABLED(CONFIG_GENERIC_GETTIMEOFDAY)) - vdso_k_time_data =3D page_address(pages + VDSO_TIME_PAGE_OFFSET); + vdso_k_time_data =3D page_address(vdso_data_pages + VDSO_TIME_PAGE_OFFSET); =20 if (IS_ENABLED(CONFIG_VDSO_GETRANDOM)) - vdso_k_rng_data =3D page_address(pages + VDSO_RNG_PAGE_OFFSET); + vdso_k_rng_data =3D page_address(vdso_data_pages + VDSO_RNG_PAGE_OFFSET); =20 if (IS_ENABLED(CONFIG_ARCH_HAS_VDSO_ARCH_DATA)) - vdso_k_arch_data =3D page_address(pages + VDSO_ARCH_PAGES_START); + vdso_k_arch_data =3D page_address(vdso_data_pages + VDSO_ARCH_PAGES_START); } =20 static vm_fault_t vvar_fault(const struct vm_special_mapping *sm,