2021-01-02 13:29:12

by Guo Ren

Subject: [PATCH] riscv: Fixup CONFIG_GENERIC_TIME_VSYSCALL

From: Guo Ren <[email protected]>

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 <[email protected]>
Cc: Atish Patra <[email protected]>
Cc: Palmer Dabbelt <[email protected]>
Cc: Vincent Chen <[email protected]>
---
arch/riscv/include/asm/vdso.h | 2 +-
arch/riscv/kernel/vdso.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

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>
--
2.7.4

2021-01-03 10:59:26

by Pekka Enberg

Subject: Re: [PATCH] riscv: Fixup CONFIG_GENERIC_TIME_VSYSCALL

On Sat, Jan 2, 2021 at 3:26 PM <[email protected]> wrote:
>
> From: Guo Ren <[email protected]>
>
> 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 <[email protected]>
> Cc: Atish Patra <[email protected]>
> Cc: Palmer Dabbelt <[email protected]>
> Cc: Vincent Chen <[email protected]>

Reviewed-by: Pekka Enberg <[email protected]>

2021-01-13 04:39:06

by Palmer Dabbelt

Subject: Re: [PATCH] riscv: Fixup CONFIG_GENERIC_TIME_VSYSCALL

On Sun, 03 Jan 2021 02:11:35 PST (-0800), [email protected] wrote:
> On Sat, Jan 2, 2021 at 3:26 PM <[email protected]> wrote:
>>
>> From: Guo Ren <[email protected]>
>>
>> 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 <[email protected]>
>> Cc: Atish Patra <[email protected]>
>> Cc: Palmer Dabbelt <[email protected]>
>> Cc: Vincent Chen <[email protected]>
>
> Reviewed-by: Pekka Enberg <[email protected]>

Thanks, this is on fixes.