From patchwork Tue Feb 20 20:04:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 203795 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp637236dyc; Tue, 20 Feb 2024 12:05:41 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCU6h7dan7SUYsnYNHBBP3csZBAh+ZcDK5ad5tg6AdYFI9+q1SYs9KjQ8K4EKFWveeyhT8/inUJ3V8Z9AigRnSYmMB9yTA== X-Google-Smtp-Source: AGHT+IE9/F9zS1WUwkHO3dvDoS4oZWskf28xDLLZw63zC6Wtxv+PtO3APVnjfpLZdyQXInND/N4v X-Received: by 2002:a17:906:1b57:b0:a3e:526c:3516 with SMTP id p23-20020a1709061b5700b00a3e526c3516mr4226456ejg.77.1708459541785; Tue, 20 Feb 2024 12:05:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708459541; cv=pass; d=google.com; s=arc-20160816; b=C94Nff878e8Aj7d24z6ybfHYvfTNb4kRnWlJmEcZvwsG5ZjBwVdPu7Cc7hlT2snKFe tJclh9+oeyTI3ef+grY7M7xQOikx+K+yqmmfUjBYj5P6WS1NRCgTZu6DLepDb83QNIRU x7PYPrcR7ZM4sSe6tJw1XPgJ/UF/dwp3up7tCE6REdfEVd3mmh1YRra1E5n6kd0oWjsM m95CQVoUsHPRhHGIaW1Jbnab2dkHLvb7+pWkDqMJxJCzuwDo9V3LXtolLLluJdBtBJCB 0zWOi6DJFadBh99QTt0iXBuY60NSz9sGimzA8drYoslyUl+yNuGXJSGHRp+n5CnhNqdM Nl+Q== 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=sX5vxbZzENHj474/hG9iZDRw8Ls/xH+loSQrYzFxXrI=; fh=NfZaxv+7aHK5LEYk5Zzfi8bjGBDezJo/OzlFGwZX4Mg=; b=HCdlUN6oEL5XJzzYZc2Z7nlC7bMMJ0BD52r/qrtc6UacsZZOBCtmwW5lP47Uq95GeM PtaW4EzUDAvM+5UPvy3iMMWWtY00EloQK1x8LjXYLDV/fXe3rQa300WPgRBslf765lUg Z+JDGpk8H/U5swzzZfMPjUW5mnR7Pd5Nvc3ueffV2qNxFTcmjnnNXhhyBe3cB9+n5WOs Dj9o33qRUayjnXZT74htjWHBixW9Er3uSnJsLpJl/Qufb4JL1U3kA2YkQNaxqa/ymJij nPT/diE4V4Aj2lKGW6thhPObmQifrCxeYFtvYjYETgJ6/EDMp1YTY420ctbMA6s6O1mr HzCw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=U8rhUSaG; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=o6gbXSOz; 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-73644-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73644-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id z17-20020a170906715100b00a3f253f1f70si198534ejj.701.2024.02.20.12.05.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 12:05:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-73644-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=U8rhUSaG; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=o6gbXSOz; 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-73644-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73644-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 am.mirrors.kernel.org (Postfix) with ESMTPS id 682D21F22499 for ; Tue, 20 Feb 2024 20:05:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2FF7714F9DD; Tue, 20 Feb 2024 20:04:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="U8rhUSaG"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="o6gbXSOz" 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 5740314AD3E; Tue, 20 Feb 2024 20:04:30 +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=EWG/DP0j8Kkoc5TrOdSA6vvQt4A71Sgc52VRRvA2KTazc5wjalI3zGcHIq3YoyWWzi+bF9JQ63wPyny2FeSW4JbeMC4wdOXSypDkDnzjP0vAW8+nlzDx/uRaeJKBY04v0HJif1xRWgMGuTNwAF/8f8FdMz2C+fDX/bAhfcBThqY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708459473; c=relaxed/simple; bh=2/pP++SEY3kfHt3ju6B5xWEYK2JC2jz/ghGI3gFwxZw=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=NfeqiI2sHJS7FYQBDckJRw6xSazLx3WapKPaksKaa742Vbg3D1nyXRzwY6TbAmpRAq28PQh9rAGJNd/0yTLEmbvQ58q5OnGG7Wqjmf753JsXXgDK9yG3iQ7PzvcRJsXAsAZ2IV1io6N+wOonkR4OXlBrdKu2amoQQj3Rx9Ukixs= 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=U8rhUSaG; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=o6gbXSOz; 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:27 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1708459468; 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=sX5vxbZzENHj474/hG9iZDRw8Ls/xH+loSQrYzFxXrI=; b=U8rhUSaGOPZd39hn0oCTiZ06p51fxWlLFeSbbt8EszDH3er2Au5gio9tuVyr9H/HwqltJo bZWzGlHKO/0S3MXLIJtYGqSQU/nz527Ysqrd9hDNyXje62aLj048E/CqeOUTXdJ+vuLG2w ATlJmNWi2xfEi1Tr2k+0vAMPCGG0nKVXpmddVNTP00V+uNbzPWBb8C9MAkDtpruVN81UtC 1A/2q5CZuPAI5DpBOMeKC3s5oLEIB4bBTsX64cN9BA8dTE7WOWuyNI6+jxl7LTYYGQIiN7 TXFBukj6fRFIbegIu09FyjyfCWl7NgESd/JoAwHfejmkYFg1gGwlzwGernj4/A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1708459468; 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=sX5vxbZzENHj474/hG9iZDRw8Ls/xH+loSQrYzFxXrI=; b=o6gbXSOzpSU1ZP0n0dcJGZMTdAvW6Qx8eXxaxV7zofTmX7ocg1tl2nonCqjE51Dc/Bv+3e rV21+iSJDemQHJAQ== 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] s390/vdso: Use generic union vdso_data_store Cc: "Anna-Maria Behnsen" , Thomas Gleixner , Vincenzo Frascino , Kees Cook , Heiko Carstens , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20240219153939.75719-8-anna-maria@linutronix.de> References: <20240219153939.75719-8-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: <170845946787.398.14130505985159382816.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791342496809208576 X-GMAIL-MSGID: 1791449672397364660 The following commit has been merged into the timers/core branch of tip: Commit-ID: cb3444cfdb48b7ee7d208d19c97a29dd8252d884 Gitweb: https://git.kernel.org/tip/cb3444cfdb48b7ee7d208d19c97a29dd8252d884 Author: Anna-Maria Behnsen AuthorDate: Mon, 19 Feb 2024 16:39:36 +01:00 Committer: Thomas Gleixner CommitterDate: Tue, 20 Feb 2024 20:56:00 +01:00 s390/vdso: Use generic union vdso_data_store There is already a generic union definition for vdso_data_store in the 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 Acked-by: Heiko Carstens Link: https://lore.kernel.org/r/20240219153939.75719-8-anna-maria@linutronix.de --- arch/s390/kernel/vdso.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/s390/kernel/vdso.c b/arch/s390/kernel/vdso.c index bbaefd8..a45b3a4 100644 --- a/arch/s390/kernel/vdso.c +++ b/arch/s390/kernel/vdso.c @@ -25,10 +25,7 @@ extern char vdso32_start[], vdso32_end[]; static struct vm_special_mapping vvar_mapping; -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;