From nobody Tue Apr 7 23:43:02 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 995C33F1659; Wed, 11 Mar 2026 09:31:51 +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=1773221512; cv=none; b=GVIsles5F/PY6ZNkXRTsTChPW7+RgQGClIpte1NJUtVQ5UGq1qPgW1CjG0JGiaKdn15vKuJxjp8zkpvV5/gENdL8s0PF/fkfOuaOhe84s7ElY7cV/BqmlG06JTQxfpQgDTz303IkC+JPWy+zUc9dWEZP+eZIS5UI7/aSFI4KS80= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773221512; c=relaxed/simple; bh=l2mXdpY9uGu8HW60Oy642igbJHBzrVmcMe6HoDKwku4=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=cFzg+BHF3BwI+wOXJ6LDzX+s6FUD1ZZrAI9kkhSivH03XZDmOHG1rK8HnBDuh2N6iQpjYRv4QDcOTcnLq9bdtjD3YLVuL750aN49Fe/4fPFbfblq60E2aWsZvUo16DlvqjHlghWypKyClOWYkBsYBx21uyNBlv3gvVGA7Z6R8YI= 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=0KlQv/4Y; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=qZjSWPPV; 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="0KlQv/4Y"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="qZjSWPPV" Date: Wed, 11 Mar 2026 09:31:49 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1773221510; 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=Sf+xKdlwakuTxxQInMLnt2PDeq5UX64wRjRx46IH5Vg=; b=0KlQv/4YWYK3EFMSm7AKVzyTyR9TX6XHCmhK5Mdh+OU404UwQupKr0fgs//Hhq/RqzwJ+G UBVt875OHT7rMlOylmD4isXt27SVsQKjlmkRLs2UfAgZVFkKOQx6whdEim5/FzWZhQWVux FuOMuhMJ6Rh+gBX+DBN2uJhuzDF0ltA1e2lZkKIYN1j76GL0nItS+CAJZ+TtzhzIjZhduG rhLMfiJ2JIFuutbpMxEUQT8js6UT4jnMx1yUkRJsepyZwFPrchth26POrG1u1/NGSkYk/9 YEUk4N86pK1aVDmwt2Qlz5tXz/DfYhDqPkwBSWCEnfIRZ+MnIAne2CGlW5QekQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1773221510; 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=Sf+xKdlwakuTxxQInMLnt2PDeq5UX64wRjRx46IH5Vg=; b=qZjSWPPVm4LHixp5uPbtKeHdc8+/L5eagcMBWJ7oQ9mF54f9rHj9Idsz6NszAJpahLlhPH hElZj2ll0vPiZpCg== 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: Reduce scope of some variables in vvar_fault() Cc: thomas.weissschuh@linutronix.de, Thomas Gleixner , Andreas Larsson , "Christophe Leroy (CS GROUP)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260304-vdso-sparc64-generic-2-v6-1-d8eb3b0e1410@linutronix.de> References: <20260304-vdso-sparc64-generic-2-v6-1-d8eb3b0e1410@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <177322150916.1647592.14896002862057508269.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: dc432ab7130bb39f5a351281a02d4bc61e85a14a Gitweb: https://git.kernel.org/tip/dc432ab7130bb39f5a351281a02d4bc61= e85a14a Author: Thomas Wei=C3=9Fschuh AuthorDate: Wed, 04 Mar 2026 08:48:58 +01:00 Committer: Thomas Gleixner CommitterDate: Wed, 11 Mar 2026 10:18:30 +01:00 vdso/datastore: Reduce scope of some variables in vvar_fault() These variables are only used inside a single branch. Move their declarations there. Signed-off-by: Thomas Wei=C3=9Fschuh Signed-off-by: Thomas Gleixner Tested-by: Andreas Larsson Reviewed-by: Andreas Larsson Reviewed-by: Christophe Leroy (CS GROUP) Link: https://patch.msgid.link/20260304-vdso-sparc64-generic-2-v6-1-d8eb3b0= e1410@linutronix.de --- lib/vdso/datastore.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/vdso/datastore.c b/lib/vdso/datastore.c index a565c30..2cca4e8 100644 --- a/lib/vdso/datastore.c +++ b/lib/vdso/datastore.c @@ -41,8 +41,7 @@ static vm_fault_t vvar_fault(const struct vm_special_mapp= ing *sm, struct vm_area_struct *vma, struct vm_fault *vmf) { struct page *timens_page =3D find_timens_vvar_page(vma); - unsigned long addr, pfn; - vm_fault_t err; + unsigned long pfn; =20 switch (vmf->pgoff) { case VDSO_TIME_PAGE_OFFSET: @@ -54,6 +53,9 @@ static vm_fault_t vvar_fault(const struct vm_special_mapp= ing *sm, * Fault in VVAR page too, since it will be accessed * to get clock data anyway. */ + unsigned long addr; + vm_fault_t err; + addr =3D vmf->address + VDSO_TIMENS_PAGE_OFFSET * PAGE_SIZE; err =3D vmf_insert_pfn(vma, addr, pfn); if (unlikely(err & VM_FAULT_ERROR))