[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <170845947148.398.9186363038131049493.tip-bot2@tip-bot2>
Date: Tue, 20 Feb 2024 20:04:31 -0000
From: "tip-bot2 for Anna-Maria Behnsen" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: "Anna-Maria Behnsen" <anna-maria@...utronix.de>,
Thomas Gleixner <tglx@...utronix.de>,
Vincenzo Frascino <vincenzo.frascino@....com>,
Kees Cook <keescook@...omium.org>, Guo Ren <guoren@...nel.org>,
x86@...nel.org, linux-kernel@...r.kernel.org
Subject: [tip: timers/core] csky/vdso: Remove superfluous ifdeffery
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@...utronix.de>
AuthorDate: Mon, 19 Feb 2024 16:39:32 +01:00
Committer: Thomas Gleixner <tglx@...utronix.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@...utronix.de>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Reviewed-by: Vincenzo Frascino <vincenzo.frascino@....com>
Reviewed-by: Kees Cook <keescook@...omium.org>
Acked-by: Guo Ren <guoren@...nel.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[];
Powered by blists - more mailing lists