From nobody Tue Nov 26 21:28:33 2024 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 C5C901E6339; Tue, 15 Oct 2024 15:57: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=1729007881; cv=none; b=ko5S2yVm/aF5q1PYsrHAv6uFnQ4Z4qDJ2YGNDusVc9G9lpvDEjiNoRACNlDx+6fx86tS3ZhjNVIxj19gkmWWRw6qIKjyd5spfv+wQsHaZD1McF/zZJSPgl4oQkm4veOFANLQH5xKIKf3pqpFZkz3Z1bEMkfYfKKkpd7qT5p8vEg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729007881; c=relaxed/simple; bh=jjNBQx8+aDp24/jMeNkr9bSEemHRo+VrDqPfJrlG0q0=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=CjkFMZYJXEDPIICwl06WZCE9pylEjSeDprBf8kgKA3laKUv8oVTSMLYYXFpK/eSfoeRa0kpiNcLt2iv4SWrm1cMCrrFwydSp1MJ1svVme5CCFM4yA3nT64Da6cnEu+k1VhQVvxY68YL72ChI1klecGwff09x+u/IIpf3JAWoY+8= 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=CC9hd5WR; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=Ug8KGtmD; 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="CC9hd5WR"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="Ug8KGtmD" Date: Tue, 15 Oct 2024 15:57:57 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1729007878; 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=n9VIyQEcwy6UZ4pH6ZOO0B9Ft6nHAnBBEitYtzrfwR8=; b=CC9hd5WRQ8opcPSzWYWVPapCUuZAiOwABF8Pqeln2qxfmhIDvdCvrAIQPwNf+59HCSW+cQ d8oQ+nJDcrGcCRV5KoQWF+fmtz1ApJZNfJgEdZcWfx+2NCaV/ecoYA4UudIP4eZbsZEc6N c2vu1NoYyd4yqdxoV0FQm+41wrobPJtPwfAovjeUYmjUK8vKWHvfhch2vN/WSYCLOuuvAc 5WccBFX53H7RCo+O8fx60eD2Jm+iLcVEE2sry4+4AX3dvWy8MKo1Mdatja4+vZxHhUqa2E g+fkg6K5lBEmTVN6YCn8bCe4yuqp+ayQmBF59w/NRFiy7fzafFpuuJ/WLbPyMw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1729007878; 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=n9VIyQEcwy6UZ4pH6ZOO0B9Ft6nHAnBBEitYtzrfwR8=; b=Ug8KGtmD/TyiaKLcUG9dJJV1ux4mgDVQ3SAilglTe4o770tERlgmJ244ZGLhGZd2bxW+yk CHuKGkpPHDJlG9Aw== 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] s390/vdso: Remove timekeeper includes Cc: thomas.weissschuh@linutronix.de, Thomas Gleixner , Heiko Carstens , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20241010-vdso-generic-arch_update_vsyscall-v1-6-7fe5a3ea4382@linutronix.de> References: <20241010-vdso-generic-arch_update_vsyscall-v1-6-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: <172900787748.1442.6057222001005792891.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: 3aa8881ebd1e673fd21785352bf5e78c2597b18f Gitweb: https://git.kernel.org/tip/3aa8881ebd1e673fd21785352bf5e78c2= 597b18f Author: Thomas Wei=C3=9Fschuh AuthorDate: Thu, 10 Oct 2024 17:44:49 +02:00 Committer: Thomas Gleixner CommitterDate: Tue, 15 Oct 2024 17:50:29 +02:00 s390/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 Acked-by: Heiko Carstens Link: https://lore.kernel.org/all/20241010-vdso-generic-arch_update_vsyscal= l-v1-6-7fe5a3ea4382@linutronix.de --- arch/s390/include/asm/vdso/vsyscall.h | 5 ----- arch/s390/kernel/time.c | 1 - 2 files changed, 6 deletions(-) diff --git a/arch/s390/include/asm/vdso/vsyscall.h b/arch/s390/include/asm/= vdso/vsyscall.h index 3c5d5e4..3eb576e 100644 --- a/arch/s390/include/asm/vdso/vsyscall.h +++ b/arch/s390/include/asm/vdso/vsyscall.h @@ -7,7 +7,6 @@ #ifndef __ASSEMBLY__ =20 #include -#include #include #include =20 @@ -17,10 +16,6 @@ enum vvar_pages { VVAR_NR_PAGES }; =20 -/* - * Update the vDSO data page to keep in sync with kernel timekeeping. - */ - static __always_inline struct vdso_data *__s390_get_k_vdso_data(void) { return vdso_data; diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index b713eff..4fae6c7 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include