From: "tip-bot2 for Anna-Maria Behnsen" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Anna-Maria Behnsen" <anna-maria@linutronix.de>,
Thomas Gleixner <tglx@linutronix.de>,
Vincenzo Frascino <vincenzo.frascino@arm.com>,
Kees Cook <keescook@chromium.org>, Guo Ren <guoren@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/core] csky/vdso: Remove superfluous ifdeffery
Date: Tue, 20 Feb 2024 20:04:31 -0000 [thread overview]
Message-ID: <170845947148.398.9186363038131049493.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20240219153939.75719-4-anna-maria@linutronix.de>
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 <anna-maria@linutronix.de>
AuthorDate: Mon, 19 Feb 2024 16:39:32 +01:00
Committer: Thomas Gleixner <tglx@linutronix.de>
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 <anna-maria@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Acked-by: Guo Ren <guoren@kernel.org>
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 <linux/types.h>
-#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 <linux/slab.h>
#include <asm/page.h>
-#ifdef GENERIC_TIME_VSYSCALL
#include <vdso/datapage.h>
-#else
-#include <asm/vdso.h>
-#endif
extern char vdso_start[], vdso_end[];
next prev parent reply other threads:[~2024-02-20 20:04 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-19 15:39 [PATCH 00/10] vdso: Misc cleanups and prevent code duplication Anna-Maria Behnsen
2024-02-19 15:39 ` [PATCH 01/10] vdso/helpers: Fix grammar in comments Anna-Maria Behnsen
2024-02-20 20:04 ` [tip: timers/core] " tip-bot2 for Anna-Maria Behnsen
2024-02-19 15:39 ` [PATCH 02/10] s390/vdso/data: Drop unnecessary header include Anna-Maria Behnsen
2024-02-19 16:21 ` Heiko Carstens
2024-02-20 20:04 ` [tip: timers/core] " tip-bot2 for Anna-Maria Behnsen
2024-02-19 15:39 ` [PATCH 03/10] csky/vdso: Remove superfluous ifdeffery Anna-Maria Behnsen
2024-02-20 1:12 ` Guo Ren
2024-02-20 20:04 ` tip-bot2 for Anna-Maria Behnsen [this message]
2024-02-19 15:39 ` [PATCH 04/10] vdso/arm: make union vdso_data_store available for all Anna-Maria Behnsen
2024-02-20 20:04 ` [tip: timers/core] vdso/ARM: Make union vdso_data_store available for all architectures tip-bot2 for Anna-Maria Behnsen
2024-02-19 15:39 ` [PATCH 05/10] arm64/vdso: Use generic union vdso_data_store Anna-Maria Behnsen
2024-02-20 20:04 ` [tip: timers/core] arm64: vdso: " tip-bot2 for Anna-Maria Behnsen
2024-02-22 15:41 ` [PATCH 05/10] arm64/vdso: " Will Deacon
2024-02-19 15:39 ` [PATCH 06/10] riscv/vdso: " Anna-Maria Behnsen
2024-02-20 6:45 ` kernel test robot
2024-02-20 8:52 ` [PATCH v1a] " Anna-Maria Behnsen
2024-02-20 20:04 ` [tip: timers/core] riscv: vdso: " tip-bot2 for Anna-Maria Behnsen
2024-02-19 15:39 ` [PATCH 07/10] s390/vdso: " Anna-Maria Behnsen
2024-02-19 16:22 ` Heiko Carstens
2024-02-20 20:04 ` [tip: timers/core] " tip-bot2 for Anna-Maria Behnsen
2024-02-19 15:39 ` [PATCH 08/10] loongarch/vdso: " Anna-Maria Behnsen
2024-02-20 20:04 ` [tip: timers/core] LoongArch: vdso: " tip-bot2 for Anna-Maria Behnsen
2024-02-19 15:39 ` [PATCH 09/10] mips/vdso: " Anna-Maria Behnsen
2024-02-20 20:04 ` [tip: timers/core] MIPS: vdso: " tip-bot2 for Anna-Maria Behnsen
2024-02-19 15:39 ` [PATCH 10/10] csky/vdso: " Anna-Maria Behnsen
2024-02-20 1:13 ` Guo Ren
2024-02-20 20:04 ` [tip: timers/core] " tip-bot2 for Anna-Maria Behnsen
2024-02-20 0:26 ` [PATCH 00/10] vdso: Misc cleanups and prevent code duplication Kees Cook
2024-02-20 9:50 ` Anna-Maria Behnsen
2024-02-20 14:48 ` Vincenzo Frascino
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=170845947148.398.9186363038131049493.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=anna-maria@linutronix.de \
--cc=guoren@kernel.org \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=vincenzo.frascino@arm.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®