Received: by 2002:a05:7412:cfc7:b0:fc:a2b0:25d7 with SMTP id by7csp1956450rdb; Tue, 20 Feb 2024 12:05:26 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVbKcPXS6/FlOobK/+okTaNKVliCbQQ+mhlUmjG0hL5Z0omWQbr2FhxypGIuhyIBjXQm6ZMvUCs5zNJV8JEmPT/2eDjyTo0bnr4AK5xmA== X-Google-Smtp-Source: AGHT+IHUkO0B56JGkXzLnFpVnsASc3U4Qm6DjR/UQI80PhZSVhlWRdn6tkrdsDwcAKAq2dZVEwDt X-Received: by 2002:a05:6214:c28:b0:68f:60fd:d319 with SMTP id a8-20020a0562140c2800b0068f60fdd319mr10319491qvd.22.1708459526101; Tue, 20 Feb 2024 12:05:26 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708459526; cv=pass; d=google.com; s=arc-20160816; b=G5aDcpxIrksVr0bi2zCmBOH96hCCXrY/3ZBC9H40kZhzhSNbacEd71mwKFXB/LgjuR 31atZK8xI3wh0oeeVbq/YiXn05tZFLsGbX0XnlxTN4FkcnCZIwqYB6WZw600b4QeEWIi Lwbzuf0dl7DFWpocb0wk4abQ3TcWv42aW5t9SiTGqrGsrE/twwds9wGkSUXDqex9QTrk YsBBNe+Quf2lCQdwM/lBRZwAXGfSj8NtA/K91mX1XrXjHNkRipamkH5nvHHLHz8wYE0C YH8OgpscW565R9GBd+TqAZLCmHgErIWcLtyIPQok3AIsP7ncrzFbkW3sTECp/RI++h3m Z0wg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:precedence:robot-unsubscribe:robot-id :message-id:mime-version:list-unsubscribe:list-subscribe:list-id :precedence:references:in-reply-to:cc:subject:to:reply-to:sender :from:dkim-signature:dkim-signature:date; bh=cupOez831WwgEQmmUacsYkV3FYrJtoBbvg1wYq5V8T4=; fh=a6/Psrb0bpVgvoChO1/Rb07f2AHm9CvbWp001nJ2HYs=; b=CTzcHYShwwNsk6RfqZ1sG3+VURadduQti0K0eUDehJ8jvHj9fH5pGK0zfw6Pu1O84W m+aLfpXk7Qz4GP2vpe8jjLA6V8YzcfEP5BnwxzpUCk0qkZnlvJZUm13JH/oQndBn/FAH T7jMA7QcEHN1kk52T3vImsGJrRvy65GOnJXCnJQqVV3jLyPinNRGHE4uPNs3F8g9MUTU q54uA4/V6QBWvY0kN/VqzWbofdTFR1Yh/HVEzv1IzZOWD9YKc0ILtQgOdO60Thx/1ICS 7umoHnpLEp9VVjJe0wtYLlzuk4X4SOzc55Dgiif89mTTfR0H/0Q1z7Tv9lxOAglJR9b7 QmFg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=nliHQMg8; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-73646-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73646-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id gm8-20020a056214268800b0068cc2e6a448si9125007qvb.99.2024.02.20.12.05.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 12:05:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-73646-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=nliHQMg8; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-73646-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73646-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 8B5371C2217B for ; Tue, 20 Feb 2024 20:05:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B8CE714E2DD; Tue, 20 Feb 2024 20:04:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="nliHQMg8"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="jBtZEobJ" 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 42AC014C5AA; Tue, 20 Feb 2024 20:04:32 +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=1708459473; cv=none; b=iv2DN6dxTfTkQ1c6v2Ay5/bZ3nCtykjzy25E5pzP4CayBDzV1ZYpqeXZ5qWlSfMiLWBUkYyIOADk+dQxwipGk+9O7/+xnHKw35tO6MuoF0NcWMeh/+gTpKqKheyGmV78GbGKaft5lThyJqj9deEqFUXqBSE00gLRG/gkjw7R34s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708459473; c=relaxed/simple; bh=qKd6PC8dt2Zlr75sWVig97tmMH/ZSxNd9EQoZmCCVgQ=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=rnDZ/UNI2CQX5yoLLiphgDH4I2cP9tcxDHimXhBN/rvUiOrK9xzTX/bfFVEgtcK1g3GveA/hR/76cqtPVfQGA3IQZ9fSp/CqCnc0OKmNteqykLMDJyScCn9gbgZmLAOpzeywX7cTZt0ibu0u8OtmCBn56b5k7hZXfkyzBOTXqMI= 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=nliHQMg8; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=jBtZEobJ; 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 Date: Tue, 20 Feb 2024 20:04:29 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1708459470; 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=cupOez831WwgEQmmUacsYkV3FYrJtoBbvg1wYq5V8T4=; b=nliHQMg8fqgI7Hq2TqY2G4eQz3zuRrZrGggGvf2vkSRiXkouqkgFv2jvdrpzGKDa/h3p6E OwMVOAwCiGW9Fkn1fOTivsPdiR6megC9gvNRKE0gXyBHE5UEVzN7lXddsz4TI9YFElaNa+ 2EYY8AZTvZV75+BiIEiOZQtc/oupUYkCr7JgyPcvCobNzP77toibBkqdXYAKW9rC609cNc x9+tPZB2fw9YijCFCbvMpUsRHaBDNkRcVtn7Z+c8ZTAlhmouxl6TyiyrQuncoFXJQLNA7v TQjhystPmhiqtJcznDsCCpj60yFYo+KlKJBgmAM/4k1Qxk/FnVkIjGx5mkyOPQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1708459470; 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=cupOez831WwgEQmmUacsYkV3FYrJtoBbvg1wYq5V8T4=; b=jBtZEobJ1ZFtS/vh570/4FEVY/2ew3lKZAyC5HQIQnafsyJXm8l5m2jFEpkZx4gBii+Ofn 0itGioZhGa1D8JCg== From: "tip-bot2 for Anna-Maria Behnsen" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/core] arm64: vdso: Use generic union vdso_data_store Cc: "Anna-Maria Behnsen" , Thomas Gleixner , Vincenzo Frascino , Kees Cook , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20240219153939.75719-6-anna-maria@linutronix.de> References: <20240219153939.75719-6-anna-maria@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <170845946975.398.3528963742493792295.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: 7bit The following commit has been merged into the timers/core branch of tip: Commit-ID: d0fba04847ae1dc7015a2e87d5e4ae1111f7744e Gitweb: https://git.kernel.org/tip/d0fba04847ae1dc7015a2e87d5e4ae1111f7744e Author: Anna-Maria Behnsen AuthorDate: Mon, 19 Feb 2024 16:39:34 +01:00 Committer: Thomas Gleixner CommitterDate: Tue, 20 Feb 2024 20:56:00 +01:00 arm64: vdso: Use generic union vdso_data_store There is already a generic union definition for vdso_data_store in vdso datapage header. Use this definition to prevent code duplication. Signed-off-by: Anna-Maria Behnsen Signed-off-by: Thomas Gleixner Reviewed-by: Vincenzo Frascino Reviewed-by: Kees Cook Link: https://lore.kernel.org/r/20240219153939.75719-6-anna-maria@linutronix.de --- arch/arm64/kernel/vdso.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c index 5562daf..89b6e78 100644 --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -69,10 +69,7 @@ static struct vdso_abi_info vdso_info[] __ro_after_init = { /* * The vDSO data page. */ -static union { - struct vdso_data data[CS_BASES]; - u8 page[PAGE_SIZE]; -} vdso_data_store __page_aligned_data; +static union vdso_data_store vdso_data_store __page_aligned_data; struct vdso_data *vdso_data = vdso_data_store.data; static int vdso_mremap(const struct vm_special_mapping *sm,