From patchwork Tue Feb 20 20:04:31 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: 203797 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp637613dyc; Tue, 20 Feb 2024 12:06:17 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUKL65wKaoltIM5U7lixXl/q6oDdE4tZ/JBDqcLhVjzOfzq58yx4ArE7jjbueT1VXoorPC5ts79bJFnGhbXoyUeDRq4PQ== X-Google-Smtp-Source: AGHT+IHX6h948j9Jf4G/S8/2a4aY5CporRfDje4gT+Bg97bK77Er++x95wWsQiskHQv2d/JCgeID X-Received: by 2002:a17:907:9483:b0:a3e:a383:3581 with SMTP id dm3-20020a170907948300b00a3ea3833581mr7710207ejc.24.1708459577424; Tue, 20 Feb 2024 12:06:17 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708459577; cv=pass; d=google.com; s=arc-20160816; b=rdnbT4lLiklDn8yCkAOl2BIYF9Ef/nX1FOiGL/TdWQ6UILfVkQ66P3CHxpJLZMf7bx vSdyFJyPunteKFdt3nV4YaRjoxUzQvwZgZsp9s9pXv/gxlJ7OjJCY/7ADGhN8+dQrovf 91zKw2nCqP/tCLvC10wrv4muEVy0O5Xn2yek1vzxBc2MK4ZAM3MQbyGv+eDhpUPaUkVo 24VMFYrLLiNSbxGaXviwc1vUx3TCTS0q9MpLi6K4eXSJsLSmChl4kbKWDqAE3OzQounz 6DXqQva5u2i3YI3zacIWM00eM6X1vcnjgO3GFDoTm1WyX3rZEB12xEMRKaJ6hflwt+rf ZWMg== 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=RIBUMm6O87L0p27q8995FI6EXw/DkNExRcvosaiWqiY=; fh=VjE6PPyhWpPTGCjHAJenvhNKV7s6YRRm4MyvMc6H/3U=; b=wcpismPuGudP32KLHJFbWE6DaGYDVI2y827ugU2ir+8h1H2BIEH1EEVniuGGFuWvvs k1ZTYo++fnxjCykaWm9GiBV8By8rP+rkKMbPW7ebcfq8U+qlMZv3D0MipVt5fmryBU1t Qnl4Oocaj/eSwLH6w63Cl2c0GwR4PhnvQza1c90MDhq4ziWjJuTjJi74gtN6KEYrWnqL xebN2lzRrtiOWY78SaSdPliBAyNyts33FEGoOouKafk/a5lON9GsrIBrMSGNlQ/x59Aa +gUfwq/M4pPYahJ1UEuuYbXAq88RuR3kL677dTATCO+2xNS3ZlEL9AxPOgH8/JI+8JyD eGhQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="R2/dHB3z"; 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-73648-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73648-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 j27-20020a170906255b00b00a3f1cfc0817si360190ejb.955.2024.02.20.12.06.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 12:06:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-73648-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="R2/dHB3z"; 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-73648-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73648-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 CDE231F22B5B for ; Tue, 20 Feb 2024 20:06:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4093C1509BC; Tue, 20 Feb 2024 20:04:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="R2/dHB3z"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="GKYi36CV" 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 E765314D44A; Tue, 20 Feb 2024 20:04:33 +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=1708459475; cv=none; b=rLIlLTuTxSmw9stdVzsbXpnmZORlz5U2/lRH1x1+Xem4yPxoySYUCLtT0w3TZERgrUpRM7ZdnObYsVCn0fS9dWxh0SOhtPNq1qQQfFeWPdXSnNg/ueXCftm9AudpARXIQcmzXo+bxZtZx/shGWml9Zg5Va51IazqIHkUTbnyfBI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708459475; c=relaxed/simple; bh=eEoqsfwjMP7shFa4kXo0PsUew5lxMiJtKf43SuYBnXU=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=MnntzAAxi/RJviOVJcVKEU+dZh3/RAsagLJPYybD2h12NUYYWsIveaJylhZYUtdBdhuxIFG5RBTBSwMDQZWfJfm+3kJNfo2Yv+oqPa0nOTseQ8R0c4QbUf8zb1OHf/Ui5dOEVX/GKpgQDxoy0YU91fdOX7HpJFYOItabYYmoXAE= 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=R2/dHB3z; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=GKYi36CV; 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:31 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1708459472; 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=RIBUMm6O87L0p27q8995FI6EXw/DkNExRcvosaiWqiY=; b=R2/dHB3zEnqAmfhe03HDL6UiFKhuvLPaA5aG+Pb7XtiUpP7l9xAVYC5FJul9hDEzABdmWM viS37m4bczW5xscEBChEpsIWxTHe0veo6GTxX/kZl/uM+gjuuogY1yk+6Je1+q/s5rPPK6 S6hXIDxh/0qbjRnPF653O5Txcr+7YMX5zMqQHRaAO/TdPuEsZ0k/ilmBlF4kGMYOrKM4V8 lBHzskFGEN1I6dBzg6XlbRFGn5K1CP4hmIkqw+UUoTbHTP2FSsQuB9XXv9jFLeV+kbRJZe 2tu4jKLO+XpZPGTORoX7Mjj4/Ew9qPl9VBxccSvhxelsjWWHaUtPYqQDOhKu7A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1708459472; 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=RIBUMm6O87L0p27q8995FI6EXw/DkNExRcvosaiWqiY=; b=GKYi36CVnaMDf6+iWqVxEhFjR4rQKzATNKzBTRAUb0wiJJdua7beVA6x4+louGgRy4WkBO 9sGy/iycR0VVdCBQ== 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: Remove superfluous ifdeffery 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-4-anna-maria@linutronix.de> References: <20240219153939.75719-4-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: <170845947148.398.9186363038131049493.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: 1791342455415072055 X-GMAIL-MSGID: 1791449710162344779 The following commit has been merged into the timers/core branch of tip: Commit-ID: 4eb0833d7de058735a424f1f783126c60a346b34 Gitweb: https://git.kernel.org/tip/4eb0833d7de058735a424f1f783126c60a346b34 Author: Anna-Maria Behnsen AuthorDate: Mon, 19 Feb 2024 16:39:32 +01:00 Committer: Thomas Gleixner CommitterDate: Tue, 20 Feb 2024 20:56:00 +01:00 csky/vdso: Remove superfluous ifdeffery CSKY selects GENERIC_TIME_VSYSCALL. GENERIC_TIME_VSYSCALL dependent ifdeffery is superfluous. Clean it up. 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-4-anna-maria@linutronix.de --- 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 bdce581..181a15e 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 16c20d6..e74a250 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[];