Message ID | 1609593874-64422-1-git-send-email-guoren@kernel.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | riscv: Fixup CONFIG_GENERIC_TIME_VSYSCALL | expand |
On Sat, Jan 2, 2021 at 3:26 PM <guoren@kernel.org> wrote: > > From: Guo Ren <guoren@linux.alibaba.com> > > The patch fix commit: ad5d112 ("riscv: use vDSO common flow to > reduce the latency of the time-related functions"). > > The GENERIC_TIME_VSYSCALL should be CONFIG_GENERIC_TIME_VSYSCALL > or vgettimeofday won't work. > > Signed-off-by: Guo Ren <guoren@linux.alibaba.com> > Cc: Atish Patra <atish.patra@wdc.com> > Cc: Palmer Dabbelt <palmerdabbelt@google.com> > Cc: Vincent Chen <vincent.chen@sifive.com> Reviewed-by: Pekka Enberg <penberg@kernel.org>
On Sun, 03 Jan 2021 02:11:35 PST (-0800), penberg@gmail.com wrote: > On Sat, Jan 2, 2021 at 3:26 PM <guoren@kernel.org> wrote: >> >> From: Guo Ren <guoren@linux.alibaba.com> >> >> The patch fix commit: ad5d112 ("riscv: use vDSO common flow to >> reduce the latency of the time-related functions"). >> >> The GENERIC_TIME_VSYSCALL should be CONFIG_GENERIC_TIME_VSYSCALL >> or vgettimeofday won't work. >> >> Signed-off-by: Guo Ren <guoren@linux.alibaba.com> >> Cc: Atish Patra <atish.patra@wdc.com> >> Cc: Palmer Dabbelt <palmerdabbelt@google.com> >> Cc: Vincent Chen <vincent.chen@sifive.com> > > Reviewed-by: Pekka Enberg <penberg@kernel.org> Thanks, this is on fixes.
diff --git a/arch/riscv/include/asm/vdso.h b/arch/riscv/include/asm/vdso.h index 8454f74..1453a2f 100644 --- a/arch/riscv/include/asm/vdso.h +++ b/arch/riscv/include/asm/vdso.h @@ -10,7 +10,7 @@ #include <linux/types.h> -#ifndef GENERIC_TIME_VSYSCALL +#ifndef CONFIG_GENERIC_TIME_VSYSCALL struct vdso_data { }; #endif diff --git a/arch/riscv/kernel/vdso.c b/arch/riscv/kernel/vdso.c index 6782042..3f1d35e 100644 --- a/arch/riscv/kernel/vdso.c +++ b/arch/riscv/kernel/vdso.c @@ -12,7 +12,7 @@ #include <linux/binfmts.h> #include <linux/err.h> #include <asm/page.h> -#ifdef GENERIC_TIME_VSYSCALL +#ifdef CONFIG_GENERIC_TIME_VSYSCALL #include <vdso/datapage.h> #else #include <asm/vdso.h>