From patchwork Tue Feb 20 20:04:25 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: 203793 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp636894dyc; Tue, 20 Feb 2024 12:05:09 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXFS2KiPvPHiiJFF4ZY9Zbn1kxeQPCfAJnemLcA88rABbFkKfiI/34irNGf09pYN41zYOcIctyY6o9v26wKn4t/AmbH4g== X-Google-Smtp-Source: AGHT+IHn5GUQtnnZv8U7PY1r+pTfRZ3dKJfja/nWviOs5zn45Yp1czv2GsutLau/gkYL0OiiaNCc X-Received: by 2002:a05:6a21:918b:b0:1a0:60b2:451 with SMTP id tp11-20020a056a21918b00b001a060b20451mr19261908pzb.7.1708459509805; Tue, 20 Feb 2024 12:05:09 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708459509; cv=pass; d=google.com; s=arc-20160816; b=RkWSKHZw3bAbasFo/QS5chcXeo2tRhxw8+u2q9dHCRif5OGee8C8H46Pn6ELC6Y8Qv rCqvWhK33edOxtTpT2BykD9gtuLfE2ghTr41IxJIE50tkkgG3NBpV5MlGuUXRUcB6/oS Un6rPoGXHCTbsa0omcJ2VTgmiaZHZ5JW8jWrDH9lUVn4ZwJXUQL7r8nLNppCMXnBGX75 aWZr3wwMDijaGUjIuZOYGo/5St5X0BJcDDw9+FTx718oiSELXE4UvTzGSFQUUy+4zw1K IIK3VHggKQHkLT/hr5oeqymfRh+vNqeqDhHWCSnH/9OXFJ6GjkLsVFWjQBOMDrTMi0FT bR9Q== 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=48pgenB3n3PaeoLPCSGxzErJYm6lQq+mkpGxA/mdBnM=; fh=VjE6PPyhWpPTGCjHAJenvhNKV7s6YRRm4MyvMc6H/3U=; b=BXnVAuwnIm4CAaKyazxj4AvWiC6aJGS7bNz5XHrNsVtEXsknCd0ZLwTCVYv3zWbNs4 P98siqEWYUNkNN9d1HfmJIfKTCK0k3R8/OBYwTsuxxBA4cU4dYJlb7qu0YBQgCxvjEFg nRKvkBIKHf6zmsAdmFbGLvjBbcnQ5hGzWyLjuHF0wOxWrGAD8Kabx7UvBzlMjDDZu3Gc poVEItZ+FpvGe+0zo6wGN2ynZO9BbGpHlzjFDNryg5Eu6DDUAIvUjJ2Fch9aKeaa+4vY Mq1LmGUPpFPi5xh1xW7D7Ji2oT+2ibZUSO7FTUnvOjhx9Fe/d6DYPnZUuYGdr8Dnsytu w2lA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=wIFxmS5c; 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-73641-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73641-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id cm12-20020a056a020a0c00b005dc9c8e5051si6755919pgb.426.2024.02.20.12.05.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 12:05:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-73641-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=wIFxmS5c; 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-73641-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73641-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id F302E283674 for ; Tue, 20 Feb 2024 20:04:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2914114A4EE; Tue, 20 Feb 2024 20:04:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="wIFxmS5c"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="OsBiEu+J" 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 BE44377656; Tue, 20 Feb 2024 20:04:27 +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=1708459469; cv=none; b=tzsCI4kwf9tMDae3R6ZUYQIEfoxv49qxjZwbtZoNMBHMVzyDwklCJq5BM8i3xQ3eDISOCX75a+NoL/A4IMcxlLzGBoMtQVHtDY72HjqS7jaLlmnQq5yKMn2Ch06mGkhernWUkcbe8cEyW7ZdzZDrm0aczz8buXh4wTmCarQsqzU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708459469; c=relaxed/simple; bh=eHlSqloIhq0tmAe4tDKZ7xiQw+QcxGeQPTn6DD+rnig=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=p5jhghcGbLalqlRhjNnDaK/nOKmSCR9bqF1F90oRz+Xnjt+WZ0bHkJK99iLY7wDoRxJ1GmlhKHiZBuWiFkGePgFOfcyRx4HZfGS9UykUOodev8Fizo88oqYNBpxkL8TSoAzOFHWRGwSC/wz+fYGag+Ydp2tChPI3cxZO8eB91Xc= 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=wIFxmS5c; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=OsBiEu+J; 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:25 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1708459466; 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=48pgenB3n3PaeoLPCSGxzErJYm6lQq+mkpGxA/mdBnM=; b=wIFxmS5cTJcKE53r/yRHHVpS7cjYYH0kL8rTJKQQNAIt/+xh3zb5KmOiD2H42q0RHftzBB xgKiwDdrf8t76jCkzX5rXLSpjYLGDyq0Ng0HPD7EWVYOBlQNRpYhtCOisNfcTK6B0BnB8a HMVlIybOdi6SLUpTC1OuEVFOcax5g2poYCZHrH6yBDYyPvRUvi2reTFNvT9B09Lyfnaxbo 62NlcLyo8nz+EeXlg1nvqzh/J23EAAsVAH/iQnFYBDsMcSXzLxxz4DxMuicFjSLzv7eGvR p5MOdPkRbkUa8dZW8CiJowhEV3R026LIJxX7CDjBYoImCZbjigm0qK1gCBypDw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1708459466; 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=48pgenB3n3PaeoLPCSGxzErJYm6lQq+mkpGxA/mdBnM=; b=OsBiEu+JS6H8bNmPH1FERAxWwuUXmLjpYdrD1T+IJ3I/jHaSTs5Vfu/O5frcFpNM2emZiP TrJXIQxSZ+WxdsDQ== 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] csky/vdso: Use generic union vdso_data_store Cc: "Anna-Maria Behnsen" , Thomas Gleixner , Vincenzo Frascino , Kees Cook , Guo Ren , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20240219153939.75719-11-anna-maria@linutronix.de> References: <20240219153939.75719-11-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: <170845946510.398.15647064695423653588.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: 1791342507806979579 X-GMAIL-MSGID: 1791449639232018917 The following commit has been merged into the timers/core branch of tip: Commit-ID: 56145a0f84e8862aeb3b36d6e21349bb4dd64269 Gitweb: https://git.kernel.org/tip/56145a0f84e8862aeb3b36d6e21349bb4dd64269 Author: Anna-Maria Behnsen AuthorDate: Mon, 19 Feb 2024 16:39:39 +01:00 Committer: Thomas Gleixner CommitterDate: Tue, 20 Feb 2024 20:56:01 +01:00 csky/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: Guo Ren Link: https://lore.kernel.org/r/20240219153939.75719-11-anna-maria@linutronix.de --- arch/csky/kernel/vdso.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/arch/csky/kernel/vdso.c b/arch/csky/kernel/vdso.c index e74a250..2ca886e 100644 --- a/arch/csky/kernel/vdso.c +++ b/arch/csky/kernel/vdso.c @@ -15,14 +15,8 @@ extern char vdso_start[], vdso_end[]; static unsigned int vdso_pages; static struct page **vdso_pagelist; -/* - * The vDSO data page. - */ -static union { - struct vdso_data data; - u8 page[PAGE_SIZE]; -} vdso_data_store __page_aligned_data; -struct vdso_data *vdso_data = &vdso_data_store.data; +static union vdso_data_store vdso_data_store __page_aligned_data; +struct vdso_data *vdso_data = vdso_data_store.data; static int __init vdso_init(void) {