From patchwork Mon Feb 19 15:39:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna-Maria Behnsen X-Patchwork-Id: 203153 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp1364253dyc; Mon, 19 Feb 2024 07:42:09 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCU7DIPuzB6PQicUD4lc0SNU/5IzsC5STlwG+wAdyYsh+BkXXDQQOOzSBOHaPwuExcTK/7n6uAnNII8fMJUdkdmFPe3eFA== X-Google-Smtp-Source: AGHT+IFUu+Wl0YTRtiTXK1dX2+qKYj/84iaRTK/70aEGtKaKWvgpHveZeuapwU1mYtCOs0eskL47 X-Received: by 2002:a05:6870:5b92:b0:218:9e23:6826 with SMTP id em18-20020a0568705b9200b002189e236826mr15209619oab.3.1708357329436; 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=mioLmJuLNj85c5Y7vzhyNf7QhADeBaMfegEA0uxVaaZjTZWlHfZtlTGrFH5jfdEq+C 12gxvWmw3rGRdvYOG/3ae4I3z/VMAdfwwmXfM/bSoAgtUpsH+EtA/H4z7UALbInaVrhN ygdhsHhkirkA6YGuWs49yHbzJGDk++wEOZ/HaVmHcamjQ4RKnftAJo56PWNUEBd6qQP3 HZUadLDS0qolTHDddC+Qc2pdpUNVaqCHgbRD1yISmBSBpF2KbhoIR7LwKNRIDI7b9fkL l3r4nbtaCUeACGd/4aavva4zyfEriySeiCGr2Acmu45RczjA61Ir2lC/TDopqOzWDWv8 iPWw== 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=TERCToEIU1g/eqQgTt1qdsHKnOD82z4H77Fq474fFqE=; fh=/liCT8ZXEl5ww1rW9kGeZLNJQDCvgh+Km7xvRZv7zSo=; b=RpZfTvjUK71IxCIZhqZRUYSzBXsNiUlDGvaRuQQN4rN2AC47Ps0lpEAxMkrMHcIIYG TgTlgX3KOK2+Yb2rEF1W/DirGcoMY/kUS2tVxbfUUpdFxRfJvSXhiaH97Ortg6gLwilM ZcTYevofRVJ58rz12EySGEPPuGFXrgO8w0WjFp8btAeD5scTjlVl4r9Jcg6cvK71i3Uy 8OqXKLIHxCzCBcBgV4QNJAERSiSuuRrOYxQiCwtgNwIJOxjzQPrEeZYcV68fScmhtIlx YfToL6doKRPGMSohDpFzWU8bEuEvrFeJXN27B4nDF+MXCqyS5kPNuAKmCZSPUp4OllQQ 2XKA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=i0YoW3qr; 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-71600-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71600-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 oo16-20020a05620a531000b007873a97da69si6338035qkn.161.2024.02.19.07.42.09 for (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-71600-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=i0YoW3qr; 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-71600-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71600-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 E4BD01C228BC for ; Mon, 19 Feb 2024 15:42:02 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DB27F446AC; 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="i0YoW3qr"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="eQSzwW4k" 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 7A7003C49A for ; 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=ss5td9S4EL/A3Z9mOknZc3B+EkUMTPA3C4qWsk8AleLcVulM1ziIRjdE7SDgCpAeOt7WsWaL837iKBoLpZXtaJCg7gQ3y72N6dihcUuAYivHao8fcyxE1TGQpht7Zr5/Pl30iHv89xi3EgX3C+zXwNlaebvNiEz7HcVhsfGiF9Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708357210; c=relaxed/simple; bh=Egn/4loMwHErFaYxX3+cKQLZn6okX8CccVfeOzBn8aw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SinziMD8y46HRsCSwPz1xT4t1qdjQdJAkN51iNN1ofLbgFcVodez1YuHC7nLY9wab7h4JQDjI2Dos1nLDzmXZJeWYIm9nuhDLKLqqopvdq/xMMy/omw92KlB5grwNgM+4o2BIYtOSA5GoBeXy1CpUKlTtblHNTt9D5R7+YnISLU= 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=i0YoW3qr; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=eQSzwW4k; 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 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=TERCToEIU1g/eqQgTt1qdsHKnOD82z4H77Fq474fFqE=; b=i0YoW3qrOVk3P8xkqI05dmx7ulsyuLhIy4BdFWKLmt8S0vVUBGjAS9N/d7bdqZ3tBQ6cP4 IYgQ/JqjZgl5NvI/i3D0gfedBge8Hr+NiZxCJ68h828PLcyLIO4l4DKVQCH9qC+U/dHVC6 8v4+TDkrgclxK1p289PeCeY4rvh0VVAMCtbdilYydpoVS5y3eEr/cWJsjAGW4PL+k6XPgz TgA/OhyqF5SVMKEaHztiL+gHRdbAslL3pcod2JaLuT6pYZGGjALPxLq2pee6FZ9jAxZZY7 n6G6xf8WF2Sa6i7wlvFtnH+MmjFzxpVC80D894uI5IESwXYVCqcqL6VYU3bPpA== 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=TERCToEIU1g/eqQgTt1qdsHKnOD82z4H77Fq474fFqE=; b=eQSzwW4kfSJejLlyBll+AQLjET3Cra/9zvqyTsqucpJCt7NwSSKmemZRCwV35XOep+vfRY AukEQf4ZmrCFKMBg== To: linux-kernel@vger.kernel.org Cc: Andy Lutomirski , Thomas Gleixner , Vincenzo Frascino , Anna-Maria Behnsen , Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org Subject: [PATCH 05/10] arm64/vdso: Use generic union vdso_data_store Date: Mon, 19 Feb 2024 16:39:34 +0100 Message-Id: <20240219153939.75719-6-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: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791342495174509380 X-GMAIL-MSGID: 1791342495174509380 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 Cc: Catalin Marinas Cc: Will Deacon Cc: linux-arm-kernel@lists.infradead.org Acked-by: Will Deacon --- 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 5562daf38a22..89b6e7840002 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,