From patchwork Mon Feb 19 15:39:32 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: 203151 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp1363906dyc; Mon, 19 Feb 2024 07:41:32 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVROpNIkMYjWIvdOScJoc7qNA8Nc38qsFjk+Bal5gULq/cKJkM2E1nYZgpiNs/xR0i5X6lSqoRxi+ZtbWOZ5nrdJjSVbQ== X-Google-Smtp-Source: AGHT+IGSMgIpZqbGOVOsOtP9Tr31oi3V+Bey/CMtwS+easCBONDDQ4mvM0FmEeSxXQw0SCOj4+9W X-Received: by 2002:a0c:e2c2:0:b0:68f:20b0:5b21 with SMTP id t2-20020a0ce2c2000000b0068f20b05b21mr13268403qvl.4.1708357292000; Mon, 19 Feb 2024 07:41:32 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708357291; cv=pass; d=google.com; s=arc-20160816; b=Lvtm0IDSZT3fOQLN3/eDX3hoAPoFcZqthP2aSEnQodciYbUccL7D5gjg6PYky3+6kr MAKUsP1O9TjELbTlZZDAtlVWEZwMm6z32Uh9fQwTdPqF7hefNFqjJKQ7SQShpho92Td5 XI8SVQbRXBu5GDBWUJM0zwxfH4yOxMbL188cJAJxgFqyzSz6bZdtn9v8rHg1zPko0ifP Qqh+frdGN46XbUSyT7Q6aD0iyH6cuCAwI1CIWKzl4NSjsCr50ED+D+frJlCBSuxXM0/t 3zoh/sNUfIStHXbXnP1zXC0NT0yuaAbdNZstAZR5JRy1i+wKdKK18DOO+5pZNpr2ktQE zxPQ== 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=U51NQ0C/sqG0k3Ofsflj974vXvNUKI5iq+y1fWYWuoA=; fh=HavhPIxzi8uQEeobxVhfVwIe7D0byHSRh/pW4SSTV6k=; b=BQN09VR5urIfvwdza58qKXcoJZ2tN/yERp4PP4HA2QxLGiQYEbM70o2IybiRuQLcx4 cYoZfLXBMiWWMdmIhhQO1D5Zka7LPUwyJcu9TLB6JxMZt3duype6kcw73+2PwT/3hd+t aurdZTC9D0PgRZmjTEK14y3geCabmvWbY1bM/ur6G7URS012/QcrMID+lwHN7GJWlxWU tLBhvRY/CFxi3lo0jsiC8okwR4t/n6Xxhgl+5bCGfYGoDU7p83yJZkxlD9nb/o3EUcoT dxEyo6H4tpI18kjfY0uOcellRWRglBoq4JyeuJDeqEEiY64QKANMQddbeQklCxtvkNk6 9jZQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=d0qhxuxn; 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-71598-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71598-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. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id jn3-20020ad45de3000000b0068f13129ab3si5183960qvb.350.2024.02.19.07.41.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 07:41:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-71598-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=d0qhxuxn; 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-71598-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71598-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 A6F341C228CA for ; Mon, 19 Feb 2024 15:41:13 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id F33A63FB35; Mon, 19 Feb 2024 15:40:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="d0qhxuxn"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="Z/DDyv+g" 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 5FE0B3A8F4; Mon, 19 Feb 2024 15:40:06 +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=1708357207; cv=none; b=OCyFbSGT2xt80hP+ARIp9e/3P6ckOgMkQmfZuudQrloQYGmgW/cEpj1+Gd0dLVTOF+9q8p5X7yXuEgciF4k/TRt5KZrBmvQ1NwfIZseLpDebJ9nZaSCHzmycxQhcB6HyqBXI0oVuu1P5MOXgR1Wfm6KTDi59w5uXKozXd9jXpho= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708357207; c=relaxed/simple; bh=58CUWxVlxm2mlSFdFUvdFxekmd2xImPEn9ABAjDBWok=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tpVdCLzgOeWE0CCAKRTnO/cu2l5Fc4ULel9RUaFK64gq5OxqZcs0esYYWFE0jSmw8em13o+qWV34Q4Zhob1tjF5+YBd7IvEZC5pV8mZw1DzbpfGB2/MhtS8sw1B8qPW21JGTrm2GIZoNZTZx6AJpzfoYvq2XeXpRixHFWPCGyOo= 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=d0qhxuxn; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=Z/DDyv+g; 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=1708357204; 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=U51NQ0C/sqG0k3Ofsflj974vXvNUKI5iq+y1fWYWuoA=; b=d0qhxuxnsSpYGsOeZ4U81H1DlPOa3vx6VYhqqfzkE16V+mu361hQ64QzxmFKtIbGhNhQXr VSDKAL/F4qd91grgCFQSWZCwW4ltGq3dXvP5xDKep7Hy7LZknzUFGBwhv+3FprUdCmvqRD SX/oDNX1uR2BgMca28mK0pUxqoh2xLAqi3DTKH4nYS696Q7dmDSJr4w9BuAzNmZP9f6psc yZsaTC3SX/M2ovROraSnk2MB1aEjVIo5KvbO5dCXYupXdxhXyJkcVqyFE6iuIaA44z9Bf9 qSZ4rCrE6OY1cIbh3kfzXkKassnS4S47ssmWQhkIITzNqzBtNzEAbqnMTHLLfA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1708357204; 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=U51NQ0C/sqG0k3Ofsflj974vXvNUKI5iq+y1fWYWuoA=; b=Z/DDyv+guMTwbx7NrIiiBC4hv7+btme15HBUJiJWRwGhFZ2vEP6hlOu7SsG2HnwffOt3kJ qPPi7YU5Qg/zmhAg== To: linux-kernel@vger.kernel.org Cc: Andy Lutomirski , Thomas Gleixner , Vincenzo Frascino , Anna-Maria Behnsen , Guo Ren , linux-csky@vger.kernel.org Subject: [PATCH 03/10] csky/vdso: Remove superfluous ifdeffery Date: Mon, 19 Feb 2024 16:39:32 +0100 Message-Id: <20240219153939.75719-4-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: 1791342455415072055 X-GMAIL-MSGID: 1791342455415072055 CSKY selects GENERIC_TIME_VSYSCALL. GENERIC_TIME_VSYSCALL dependent ifdeffery is superfluous. Clean it up. Signed-off-by: Anna-Maria Behnsen Cc: Guo Ren Cc: linux-csky@vger.kernel.org Acked-by: Guo Ren --- arch/csky/include/asm/vdso.h | 5 ----- arch/csky/kernel/vdso.c | 4 ---- 2 files changed, 9 deletions(-) diff --git a/arch/csky/include/asm/vdso.h b/arch/csky/include/asm/vdso.h index bdce581b5fcb..181a15edafe8 100644 --- a/arch/csky/include/asm/vdso.h +++ b/arch/csky/include/asm/vdso.h @@ -5,11 +5,6 @@ #include -#ifndef GENERIC_TIME_VSYSCALL -struct vdso_data { -}; -#endif - /* * The VDSO symbols are mapped into Linux so we can just use regular symbol * addressing to get their offsets in userspace. The symbols are mapped at an diff --git a/arch/csky/kernel/vdso.c b/arch/csky/kernel/vdso.c index 16c20d64d165..e74a2504d331 100644 --- a/arch/csky/kernel/vdso.c +++ b/arch/csky/kernel/vdso.c @@ -8,11 +8,7 @@ #include #include -#ifdef GENERIC_TIME_VSYSCALL #include -#else -#include -#endif extern char vdso_start[], vdso_end[];