Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03E42C433DF for ; Wed, 1 Jul 2020 20:30:47 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CCD662071A for ; Wed, 1 Jul 2020 20:30:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="MOlsnwHX"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="SK/HZzTt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CCD662071A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=BbIxmjGfAH5mmfQli9kNkYF67Z0REGwa/IFjWUVRAnU=; b=MOlsnwHXwVBSNV1ykfZGv31EA OJirxAU3WbBbJfwEarKoaBqBgXJxWbviYhfIdZvo8COnBcMfrOoRllnXCoawbJ7GBo/wscuAv3L9u CPpetgyFBcQhQ4jWA7KxTJda+kc4QV55oQVzMLxJWneEXoKEeCs1ztX8NTmJ/Z6D2Su+ztAcPCTXl jm6etd2krTc/HqG9ougkM/T56f8LLUvGOoHGHRMUA2Xcs27gpkvxZcxhWm4tCJh4UzCRhSMUUTsbT JhrKs5ZFDtLuhaBHPmupL1ly61t7/9NKcFc9mjwCQGtUeC5WBnKAKs8DGydObU3KSe8B9MDkrZ/jt QuVU1Oq2g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqjMF-0004YK-NB; Wed, 01 Jul 2020 20:29:27 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqjMC-0004XG-2h for linux-arm-kernel@lists.infradead.org; Wed, 01 Jul 2020 20:29:24 +0000 Received: from localhost (fw-tnat.cambridge.arm.com [217.140.96.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0151C2071A; Wed, 1 Jul 2020 20:29:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593635363; bh=Id1KXqwMjbk8sz49zIjwnI4K7EqQAssEgFPenfzzSiY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SK/HZzTtoFsqr+TcdCJW9ru3MQ37hu1W7zE0Rh7WJOizWEa+0C+bWkUvMbjMfv7H7 Rp0ZOkDefhk04nZxWngDk3ibVg0+ZfcvZksUOb+6WtVQkwtoa56CiPRygOrbSKlbR6 SPEgLSdEv/sfp0n9/Y4l8mt1ztH2uN2mVyKqa/xM= From: Mark Brown To: Catalin Marinas , Will Deacon , Marc Zyngier Subject: [PATCH v2 05/11] arm64: vdso: Remove union in declaration of the data store Date: Wed, 1 Jul 2020 21:28:40 +0100 Message-Id: <20200701202846.54648-6-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701202846.54648-1-broonie@kernel.org> References: <20200701202846.54648-1-broonie@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200701_162924_223022_2CDEC7B5 X-CRM114-Status: GOOD ( 13.37 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Brown , Andrei Vagin , Vincenzo Frascino , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Currently the vDSO data store is declared as part of a union with a page of char for no documented reason, it *appears* that this has been done for alignment purposes but we also have a __page_aligned_data annotation so it's not 100% clear why and confusing when looking at the code. Since it seems to be redundant with current toolchains remove the union. Signed-off-by: Mark Brown --- arch/arm64/kernel/vdso.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c index bdc18fc80eb3..b05e4d5880af 100644 --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -69,14 +69,8 @@ static struct vdso_abi_info vdso_info[] __ro_after_init = { #endif /* CONFIG_COMPAT_VDSO */ }; -/* - * The vDSO data page. - */ -static union { - struct arm64_vdso_data data; - u8 page[PAGE_SIZE]; -} vdso_data_store __page_aligned_data; -struct vdso_data *vdso_data = vdso_data_store.data.data; +struct arm64_vdso_data vdso_data_store __page_aligned_data; +struct vdso_data *vdso_data = vdso_data_store.data; static int __vdso_remap(enum vdso_abi abi, const struct vm_special_mapping *sm, -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel