Message ID | 20240219153939.75719-7-anna-maria@linutronix.de |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-71601-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp1364252dyc; Mon, 19 Feb 2024 07:42:09 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWnjkhPlb9wSc867R0UYWiFgd6OMEv6mQMzxVpOoZQ/1e7wxcwopSiDSUp/nXLZLmmxT6VDQv+bbN+rNwxu+1rVgBMRmg== X-Google-Smtp-Source: AGHT+IEmuqT6aIW6HS9xbDa1yckQTzhe4/qw+BUWTtUQ7YVyUIedNfOTDwGCa3v3eHQtbzbm/cCU X-Received: by 2002:a05:622a:54e:b0:42e:beb:bb3c with SMTP id m14-20020a05622a054e00b0042e0bebbb3cmr4252726qtx.43.1708357329508; Mon, 19 Feb 2024 07:42:09 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708357329; cv=pass; d=google.com; s=arc-20160816; b=cKWGA/2DGLtfceNj3J/p/7UyzWarSgRjyeZutAFQQ8GshTDcS4HX+ZRXmlalhWwjti 4z18VWGVexwOcpYFfTO4qvtCmLvJW0lBVXjMLk6depK1xSQD8amriixH97fJmOy+gPTo f8yO3qQIWV2bUu+4Yl30lcpHdLLXUSwYpMsyD3Ln+vFS4hJ3KmuiBq+uQgSNXhNbV19z fo7T90CUHBPZHqgbK4kVjo/cYkx1v+09DRjFGd3eqB+JtKd+z6ob5xUoWefqCIbd+s6O XMsTQp74mhpD/2EPjv88+sG2HsyFopEAqrPNZo86TtAq96ZEWdVwv2LsaIxajmy220ze GP1w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:dkim-signature:dkim-signature:from; bh=HSJH2Cy3AOqZmgikXh7qng6szl5HlWuz3PgXeKPeks4=; fh=x3JoHGwOrSN2MhJ27mJ87dngKJthnbtuRMDwC03W7dI=; b=pkw8DB0+XDQ37NICtHvAvSW2nHHrl7M/0sF9mmhGR237jOa6BfBWQ0XrRXL34SDCue S6kY7+C6Mbj8bMyIbkx+8oXr9qrqn2rBGWes77S5qysmtPJutGDcwns6uMVEjkRqzU9e ff73piVvP0uAC4HTRm39qkRqkDOlf4tkpp9bsQXx6mnDpgoJ34KVyomYgICUWQgRgZW0 jzgo85/MzE3AQZJKxu0TsxQzKzWDhSrlvCurE1DrvF+vilSW4eWYOkenWYgvUJVqXbQC 4wBvHmzUAFu9HVp3lXOungr2u7cJDdwHegIWQnnD4wNbwR3MF5Qnq2TxxIPn1O6mGd9R fQJQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=e8ck0Fru; 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-71601-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71601-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id m18-20020ac86892000000b0042c57017316si5946095qtq.64.2024.02.19.07.42.09 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 07:42:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-71601-ouuuleilei=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=e8ck0Fru; 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-71601-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71601-ouuuleilei=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 31E771C2274D for <ouuuleilei@gmail.com>; Mon, 19 Feb 2024 15:42:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EB54F446AE; Mon, 19 Feb 2024 15:40:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="e8ck0Fru"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="OUpLh70/" 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 7A7343C49C for <linux-kernel@vger.kernel.org>; Mon, 19 Feb 2024 15:40:08 +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=1708357210; cv=none; b=HHfNONNeIFKtRSstN7pOYO4FVqdCcX8avaIZHTZZ0L0ax5MBkZdg7MokCB1EJwvV6B3N+8r9GUEiKK7CMf/G8o8H0HQ+G1yw3FGnVy4jxDyn3F/66c/ZXHe/tyKNs1x4FEA998VA8M8g9hYoJgkWrHuq6KD5snKg6N61q+0zDSo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708357210; c=relaxed/simple; bh=uwGKUudqINu/l2LS4UDnc84Sy7bVMtcbCFymgjZtMeI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fKj6gQQq0AyMv2Jc17r2iresi6F7MBpd4xH62iFbVN4TIyoqcGbJrMZkWhKVKfqY9MLrWvoN7lW7chR/zp8YNcSgNAOrRro4TjRXWsVrQnBb8A9iX3MhjKUBer/061jPZDYeTJ3BX6t2NTNLWHGmOhHzI/EjvqHa6FqMrYpC2BU= 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=e8ck0Fru; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=OUpLh70/; 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 From: Anna-Maria Behnsen <anna-maria@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1708357205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HSJH2Cy3AOqZmgikXh7qng6szl5HlWuz3PgXeKPeks4=; b=e8ck0FruzZ8Ag+/b5iHDLfIUxz9zmagc1f5rEiyK5hbbzj/S1I6gnFAFXaVxyBtsMkqHzF r3sco+vWtbdQfXMs/jAETq3/y9aizlcKB6nlpxeqssBVvNsHtpfgiak0jRhNchDVoGjYKq RZPEA3ub6REw1ibtUcbODrfwKIIwHzy60GRhDTtZ0y3wAORbzXwiK2V4vJ3zVWTB+L9Ky5 3ZV9koyLq5KoU80y9k6mp+yeksnv1k5N8zMCi65KDKTGZ+G0Y5ATW8+/nHgR91kIoE43T1 GIvca5Ues2wsqmpjhDoIhNEMY5vX7qfxmb3U9m4wISnoEoWZyJSTVNr2dPeqsw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1708357205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HSJH2Cy3AOqZmgikXh7qng6szl5HlWuz3PgXeKPeks4=; b=OUpLh70/kjYmndXYQ+Zlava3G4i+VeFfT1Xxc2MZrt7OW5qubKGDDj7Q3tgRl3hGOuaL6g Nbk18oNRr5ZzodBA== To: linux-kernel@vger.kernel.org Cc: Andy Lutomirski <luto@kernel.org>, Thomas Gleixner <tglx@linutronix.de>, Vincenzo Frascino <vincenzo.frascino@arm.com>, Anna-Maria Behnsen <anna-maria@linutronix.de>, Paul Walmsley <paul.walmsley@sifive.com>, Palmer Dabbelt <palmer@dabbelt.com>, Albert Ou <aou@eecs.berkeley.edu>, linux-riscv@lists.infradead.org Subject: [PATCH 06/10] riscv/vdso: Use generic union vdso_data_store Date: Mon, 19 Feb 2024 16:39:35 +0100 Message-Id: <20240219153939.75719-7-anna-maria@linutronix.de> In-Reply-To: <20240219153939.75719-1-anna-maria@linutronix.de> References: <20240219153939.75719-1-anna-maria@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791342495446151541 X-GMAIL-MSGID: 1791342495446151541 |
Series |
vdso: Misc cleanups and prevent code duplication
|
|
Commit Message
Anna-Maria Behnsen
Feb. 19, 2024, 3:39 p.m. UTC
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 <anna-maria@linutronix.de>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: linux-riscv@lists.infradead.org
---
arch/riscv/kernel/vdso.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
Comments
Hi Anna-Maria,
kernel test robot noticed the following build errors:
[auto build test ERROR on s390/features]
[also build test ERROR on kees/for-next/execve arm64/for-next/core linus/master v6.8-rc5 next-20240219]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Anna-Maria-Behnsen/vdso-helpers-Fix-grammar-in-comments/20240219-234251
base: https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git features
patch link: https://lore.kernel.org/r/20240219153939.75719-7-anna-maria%40linutronix.de
patch subject: [PATCH 06/10] riscv/vdso: Use generic union vdso_data_store
config: riscv-allnoconfig (https://download.01.org/0day-ci/archive/20240220/202402201410.g0YeFhx8-lkp@intel.com/config)
compiler: riscv64-linux-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240220/202402201410.g0YeFhx8-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202402201410.g0YeFhx8-lkp@intel.com/
All errors (new ones prefixed by >>):
>> arch/riscv/kernel/vdso.c:34:31: error: initialization of 'struct vdso_data *' from incompatible pointer type 'struct vdso_data (*)[2]' [-Werror=incompatible-pointer-types]
34 | struct vdso_data *vdso_data = &vdso_data_store.data;
| ^
cc1: some warnings being treated as errors
vim +34 arch/riscv/kernel/vdso.c
78a743cd82a35c Tong Tiangen 2021-09-01 32
2f3f68e0423414 Anna-Maria Behnsen 2024-02-19 33 static union vdso_data_store vdso_data_store __page_aligned_data;
ad5d1122b82fbd Vincent Chen 2020-06-09 @34 struct vdso_data *vdso_data = &vdso_data_store.data;
76d2a0493a17d4 Palmer Dabbelt 2017-07-10 35
diff --git a/arch/riscv/kernel/vdso.c b/arch/riscv/kernel/vdso.c index 2cf76218a5bd..100cdea6d3e3 100644 --- a/arch/riscv/kernel/vdso.c +++ b/arch/riscv/kernel/vdso.c @@ -30,13 +30,7 @@ enum rv_vdso_map { #define VVAR_SIZE (VVAR_NR_PAGES << PAGE_SHIFT) -/* - * The vDSO data page. - */ -static union { - struct vdso_data data; - 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; struct __vdso_info {