Skip to content

Commit bad53ae

Browse files
t-8chKAGA-KOKO
authored andcommitted
vdso: Drop Kconfig GENERIC_VDSO_TIME_NS
All architectures implementing time-related functionality in the vDSO are using the generic vDSO library which handles time namespaces properly. Remove the now unnecessary Kconfig symbol. Enables the use of time namespaces on architectures, which use the generic vDSO but did not enable GENERIC_VDSO_TIME_NS, namely MIPS and arm. Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Link: https://lore.kernel.org/all/20250826-vdso-cleanups-v1-10-d9b65750e49f@linutronix.de
1 parent 7b338f6 commit bad53ae

9 files changed

Lines changed: 1 addition & 14 deletions

File tree

arch/arm64/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ config ARM64
162162
select GENERIC_SMP_IDLE_THREAD
163163
select GENERIC_TIME_VSYSCALL
164164
select GENERIC_GETTIMEOFDAY
165-
select GENERIC_VDSO_TIME_NS
166165
select HARDIRQS_SW_RESEND
167166
select HAS_IOPORT
168167
select HAVE_MOVE_PMD

arch/loongarch/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ config LOONGARCH
108108
select GENERIC_SCHED_CLOCK
109109
select GENERIC_SMP_IDLE_THREAD
110110
select GENERIC_TIME_VSYSCALL
111-
select GENERIC_VDSO_TIME_NS
112111
select GPIOLIB
113112
select HAS_IOPORT
114113
select HAVE_ARCH_AUDITSYSCALL

arch/powerpc/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ config PPC
207207
select GENERIC_PCI_IOMAP if PCI
208208
select GENERIC_SMP_IDLE_THREAD
209209
select GENERIC_TIME_VSYSCALL
210-
select GENERIC_VDSO_TIME_NS
211210
select HAS_IOPORT if PCI
212211
select HAVE_ARCH_AUDITSYSCALL
213212
select HAVE_ARCH_HUGE_VMALLOC if HAVE_ARCH_HUGE_VMAP

arch/riscv/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ config RISCV
121121
select GENERIC_SCHED_CLOCK
122122
select GENERIC_SMP_IDLE_THREAD
123123
select GENERIC_TIME_VSYSCALL if GENERIC_GETTIMEOFDAY
124-
select GENERIC_VDSO_TIME_NS if GENERIC_GETTIMEOFDAY
125124
select HARDIRQS_SW_RESEND
126125
select HAS_IOPORT if MMU
127126
select HAVE_ALIGNED_STRUCT_PAGE

arch/s390/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ config S390
167167
select GENERIC_GETTIMEOFDAY
168168
select GENERIC_SMP_IDLE_THREAD
169169
select GENERIC_TIME_VSYSCALL
170-
select GENERIC_VDSO_TIME_NS
171170
select GENERIC_IOREMAP if PCI
172171
select HAVE_ALIGNED_STRUCT_PAGE
173172
select HAVE_ARCH_AUDITSYSCALL

arch/x86/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ config X86
181181
select GENERIC_SMP_IDLE_THREAD
182182
select GENERIC_TIME_VSYSCALL
183183
select GENERIC_GETTIMEOFDAY
184-
select GENERIC_VDSO_TIME_NS
185184
select GENERIC_VDSO_OVERFLOW_PROTECT
186185
select GUP_GET_PXX_LOW_HIGH if X86_PAE
187186
select HARDIRQS_SW_RESEND

init/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1347,7 +1347,7 @@ config UTS_NS
13471347

13481348
config TIME_NS
13491349
bool "TIME namespace"
1350-
depends on GENERIC_VDSO_TIME_NS
1350+
depends on GENERIC_GETTIMEOFDAY
13511351
default y
13521352
help
13531353
In this namespace boottime and monotonic clocks can be set.

lib/vdso/Kconfig

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@ config GENERIC_GETTIMEOFDAY
1212
Each architecture that enables this feature has to
1313
provide the fallback implementation.
1414

15-
config GENERIC_VDSO_TIME_NS
16-
bool
17-
help
18-
Selected by architectures which support time namespaces in the
19-
VDSO
20-
2115
config GENERIC_VDSO_OVERFLOW_PROTECT
2216
bool
2317
help

tools/testing/selftests/pidfd/config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@ CONFIG_USER_NS=y
44
CONFIG_PID_NS=y
55
CONFIG_NET_NS=y
66
CONFIG_TIME_NS=y
7-
CONFIG_GENERIC_VDSO_TIME_NS=y
87
CONFIG_CGROUPS=y
98
CONFIG_CHECKPOINT_RESTORE=y

0 commit comments

Comments
 (0)