Skip to content

Commit 2f956db

Browse files
Revert "RISC-V: vDSO: Wire up getrandom() vDSO implementation"
This has been on -next for a bit, but it's broken and there's already a v2. So I'm reverting it to avoid more rebasing. This reverts commit 8907952. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Palmer Dabbelt <[email protected]>
1 parent 1a3f698 commit 2f956db

File tree

7 files changed

+0
-300
lines changed

7 files changed

+0
-300
lines changed

arch/riscv/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,6 @@ config RISCV
218218
select THREAD_INFO_IN_TASK
219219
select TRACE_IRQFLAGS_SUPPORT
220220
select UACCESS_MEMCPY if !MMU
221-
select VDSO_GETRANDOM if HAVE_GENERIC_VDSO
222221
select USER_STACKTRACE_SUPPORT
223222
select ZONE_DMA32 if 64BIT
224223

arch/riscv/include/asm/vdso/getrandom.h

Lines changed: 0 additions & 30 deletions
This file was deleted.

arch/riscv/kernel/vdso/Makefile

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,9 @@ vdso-syms += flush_icache
1313
vdso-syms += hwprobe
1414
vdso-syms += sys_hwprobe
1515

16-
ifdef CONFIG_VDSO_GETRANDOM
17-
vdso-syms += getrandom
18-
endif
19-
2016
# Files to link into the vdso
2117
obj-vdso = $(patsubst %, %.o, $(vdso-syms)) note.o
2218

23-
ifdef CONFIG_VDSO_GETRANDOM
24-
obj-vdso += vgetrandom-chacha.o
25-
endif
26-
2719
ccflags-y := -fno-stack-protector
2820
ccflags-y += -DDISABLE_BRANCH_PROFILING
2921
ccflags-y += -fno-builtin
@@ -32,10 +24,6 @@ ifneq ($(c-gettimeofday-y),)
3224
CFLAGS_vgettimeofday.o += -fPIC -include $(c-gettimeofday-y)
3325
endif
3426

35-
ifneq ($(c-getrandom-y),)
36-
CFLAGS_getrandom.o += -fPIC -include $(c-getrandom-y)
37-
endif
38-
3927
CFLAGS_hwprobe.o += -fPIC
4028

4129
# Build rules

arch/riscv/kernel/vdso/getrandom.c

Lines changed: 0 additions & 10 deletions
This file was deleted.

arch/riscv/kernel/vdso/vdso.lds.S

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ VERSION
8080
#ifndef COMPAT_VDSO
8181
__vdso_riscv_hwprobe;
8282
#endif
83-
__vdso_getrandom;
8483
local: *;
8584
};
8685
}

arch/riscv/kernel/vdso/vgetrandom-chacha.S

Lines changed: 0 additions & 244 deletions
This file was deleted.

tools/testing/selftests/vDSO/vgetrandom-chacha.S

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
#include "../../../../arch/loongarch/vdso/vgetrandom-chacha.S"
1212
#elif defined(__powerpc__) || defined(__powerpc64__)
1313
#include "../../../../arch/powerpc/kernel/vdso/vgetrandom-chacha.S"
14-
#elif defined(__riscv) && __riscv_xlen == 64
15-
#include "../../../../arch/riscv/kernel/vdso/vgetrandom-chacha.S"
1614
#elif defined(__s390x__)
1715
#include "../../../../arch/s390/kernel/vdso64/vgetrandom-chacha.S"
1816
#elif defined(__x86_64__)

0 commit comments

Comments
 (0)