From nobody Sat Feb 7 09:46:43 2026 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 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" 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the timers/core branch of tip: Commit-ID: 4eb0833d7de058735a424f1f783126c60a346b34 Gitweb: https://git.kernel.org/tip/4eb0833d7de058735a424f1f783126c60= a346b34 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@linutroni= x.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 @@ =20 #include =20 -#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 a= t 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 =20 #include -#ifdef GENERIC_TIME_VSYSCALL #include -#else -#include -#endif =20 extern char vdso_start[], vdso_end[];