2024-02-19 15:40:39

by Anna-Maria Behnsen

[permalink] [raw]
Subject: [PATCH 03/10] 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 <[email protected]>
Cc: Guo Ren <[email protected]>
Cc: [email protected]
---
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 <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 16c20d64d165..e74a2504d331 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[];

--
2.39.2



2024-02-20 01:13:13

by Guo Ren

[permalink] [raw]
Subject: Re: [PATCH 03/10] csky/vdso: Remove superfluous ifdeffery

On Mon, Feb 19, 2024 at 11:40 PM Anna-Maria Behnsen
<[email protected]> wrote:
>
> CSKY selects GENERIC_TIME_VSYSCALL. GENERIC_TIME_VSYSCALL dependent
> ifdeffery is superfluous. Clean it up.
>
> Signed-off-by: Anna-Maria Behnsen <[email protected]>
> Cc: Guo Ren <[email protected]>
> Cc: [email protected]
> ---
> 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 <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 16c20d64d165..e74a2504d331 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[];
>
> --
> 2.39.2
>
Acked-by: Guo Ren <[email protected]>

--
Best Regards
Guo Ren

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 <[email protected]>
AuthorDate: Mon, 19 Feb 2024 16:39:32 +01:00
Committer: Thomas Gleixner <[email protected]>
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 <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Reviewed-by: Vincenzo Frascino <[email protected]>
Reviewed-by: Kees Cook <[email protected]>
Acked-by: Guo Ren <[email protected]>
Link: https://lore.kernel.org/r/[email protected]

---
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[];