From nobody Tue Mar 11 19:49:50 2025 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 4305C1F669E; Tue, 15 Oct 2024 15:58:02 +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=1729007883; cv=none; b=eRARDdra0FNyYzprDTU5p+WV6rVahqjx/gVw4JCY8EFks8Yh/cDNPa6Zv+1z8AF3e3UFTT8JY+eb3zPPF9dfyyiyk76k8WABF8cM0wEtzg96RAprt7PacrQxxpJVWGPzOVQwVymEiExXxBYtqhdIvjZmcDEIJdXPgTyGZFVDfYA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729007883; c=relaxed/simple; bh=ymK2HJjNybOgqopwdufoTdOfGygtGoM6A7L//5gjVKs=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=uulmlh+ZN958R6U/8pCAVJ0XTMLkwv/2yuxa45QiimES1y1csNu9SjsBX6rRaemyxmbUPjsa78NONvimIbruTJOUQJQEkS1R61g0PpgJYTdJwJvvDNOmtwHNWoeJrOg9y6w5n+hL7ELjdtHMV2C/5kQMZmCGxRHQd8XeZ151yJw= 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=l2nPZyW8; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=AMq+7YSD; 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="l2nPZyW8"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="AMq+7YSD" Date: Tue, 15 Oct 2024 15:57:59 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1729007881; 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=fHHXyn/jWI3YSJX+MuB14rlsymWyGnorFsF1tkl75Fs=; b=l2nPZyW86IoWAllbktwDIWgR/hNlurrREaV1UCHt1Y9H/6IBvpU9agvvXYtuohiShWwwhC 2/WR5d8PjS8V7v0v7GOsdVEDhp5VzbCProkMLuvyTks0uKRm99ynHfiCqr6WGxYAo3M63t v8e6H8Mu02heNJiS36LPcPyAS1upOo6r9JjhnB/vbQnn/gZbtat0bWjECpdVWNQMxZHR70 jVIVDtX9RbxOKtpY76Etn3VPr+IRNZZG0GHZ0MGrKOEkVHMIiSBmlHLZYE8OJlvDx5vip8 X1PL8aXphOZrzWdp5+79aEe/1Z4KBJwDS+8YI0iojobLuQWhDtcDGXqfjdK/iw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1729007881; 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=fHHXyn/jWI3YSJX+MuB14rlsymWyGnorFsF1tkl75Fs=; b=AMq+7YSDNn09nCtN3nYm8pIJXsh6sX/8dhaz69oYSoguHTOLZsk1vcH/gnd2zXKlLvcvrE XFuVqrZKr9jP4YDA== 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] arm: vdso: Remove timekeeper includes Cc: thomas.weissschuh@linutronix.de, Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20241010-vdso-generic-arch_update_vsyscall-v1-2-7fe5a3ea4382@linutronix.de> References: <20241010-vdso-generic-arch_update_vsyscall-v1-2-7fe5a3ea4382@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <172900787998.1442.17495041583304865480.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: d2caf94c0a94e32a0beb56beacaf380ad33124fb Gitweb: https://git.kernel.org/tip/d2caf94c0a94e32a0beb56beacaf380ad= 33124fb Author: Thomas Wei=C3=9Fschuh AuthorDate: Thu, 10 Oct 2024 17:44:45 +02:00 Committer: Thomas Gleixner CommitterDate: Tue, 15 Oct 2024 17:50:29 +02:00 arm: vdso: Remove timekeeper includes Since the generic VDSO clock mode storage is used, this header file is unused and can be removed. This avoids including a non-VDSO header while building the VDSO, which can lead to compilation errors. Also drop the comment which is out of date and in the wrong place. Signed-off-by: Thomas Wei=C3=9Fschuh Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/all/20241010-vdso-generic-arch_update_vsyscal= l-v1-2-7fe5a3ea4382@linutronix.de --- arch/arm/include/asm/vdso/vsyscall.h | 4 ---- arch/arm/kernel/vdso.c | 1 - 2 files changed, 5 deletions(-) diff --git a/arch/arm/include/asm/vdso/vsyscall.h b/arch/arm/include/asm/vd= so/vsyscall.h index 47e41ae..7054147 100644 --- a/arch/arm/include/asm/vdso/vsyscall.h +++ b/arch/arm/include/asm/vdso/vsyscall.h @@ -4,16 +4,12 @@ =20 #ifndef __ASSEMBLY__ =20 -#include #include #include =20 extern struct vdso_data *vdso_data; extern bool cntvct_ok; =20 -/* - * Update the vDSO data page to keep in sync with kernel timekeeping. - */ static __always_inline struct vdso_data *__arm_get_k_vdso_data(void) { diff --git a/arch/arm/kernel/vdso.c b/arch/arm/kernel/vdso.c index d499ad4..29dd2f3 100644 --- a/arch/arm/kernel/vdso.c +++ b/arch/arm/kernel/vdso.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include