On Mon, Feb 19, 2024 at 11:40 PM Anna-Maria Behnsen <anna-maria@xxxxxxxxxxxxx> wrote: > > CSKY selects GENERIC_TIME_VSYSCALL. GENERIC_TIME_VSYSCALL dependent > ifdeffery is superfluous. Clean it up. > > Signed-off-by: Anna-Maria Behnsen <anna-maria@xxxxxxxxxxxxx> > Cc: Guo Ren <guoren@xxxxxxxxxx> > Cc: linux-csky@xxxxxxxxxxxxxxx > --- > 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 <guoren@xxxxxxxxxx> -- Best Regards Guo Ren