mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Thomas Weißschuh" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: thomas.weissschuh@linutronix.de,
	Thomas Gleixner <tglx@kernel.org>,
	Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
	Daniel Lezcano <daniel.lezcano@kernel.org>,
	Andy Lutomirski <luto@kernel.org>,
	Vincenzo Frascino <vincenzo.frascino@arm.com>,
	Arnd Bergmann <arnd@arndb.de>,
	linux-mips@vger.kernel.org, x86@kernel.org,
	linux-kernel@vger.kernel.org
Subject: [tip: timers/vdso] MIPS: VDSO: Fold MIPS_DISABLE_VDSO into MIPS_GENERIC_GETTIMEOFDAY
Date: Tue, 09 Jun 2026 15:04:02 -0000	[thread overview]
Message-ID: <178101744261.529383.4172241930455809223.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20260521-vdso-mips-kconfig-v1-7-2f79dcd6c78f@linutronix.de>

The following commit has been merged into the timers/vdso branch of tip:

Commit-ID:     51512c216e1d2ab4822282c9ecdd40f43fa1484c
Gitweb:        https://git.kernel.org/tip/51512c216e1d2ab4822282c9ecdd40f43fa1484c
Author:        Thomas Weißschuh <thomas.weissschuh@linutronix.de>
AuthorDate:    Thu, 21 May 2026 08:53:21 +02:00
Committer:     Thomas Gleixner <tglx@kernel.org>
CommitterDate: Tue, 09 Jun 2026 17:02:10 +02:00

MIPS: VDSO: Fold MIPS_DISABLE_VDSO into MIPS_GENERIC_GETTIMEOFDAY

The currently used MIPS_DISABLE_VDSO will disable only the userspace
bits of the time-related vDSO. The kernel part is still pointlessly
built and running.

Remove MIPS_DISABLE_VDSO and fold its usecase into
MIPS_GENERIC_GETTIMEOFDAY, which works correctly.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Daniel Lezcano <daniel.lezcano@kernel.org>
Cc: Thomas Gleixner <tglx@kernel.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-mips@vger.kernel.org
Link: https://patch.msgid.link/20260521-vdso-mips-kconfig-v1-7-2f79dcd6c78f@linutronix.de
---
 arch/mips/Kconfig         | 6 ++++--
 arch/mips/vdso/Kconfig    | 6 ------
 arch/mips/vdso/Makefile   | 7 ++-----
 arch/mips/vdso/vdso.lds.S | 2 +-
 4 files changed, 7 insertions(+), 14 deletions(-)
 delete mode 100644 arch/mips/vdso/Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index f56e1a5..6463b0b 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -3171,6 +3171,10 @@ config MIPS_GENERIC_GETTIMEOFDAY
 	def_bool y
 	select GENERIC_GETTIMEOFDAY
 	select HAVE_GENERIC_VDSO
+	# GCC (at least up to version 9.2) appears to emit function calls that make use
+	# of the GOT when targeting microMIPS, which we can't use in the VDSO due to
+	# the lack of relocations. As such, we disable the VDSO for microMIPS builds.
+	depends on !CPU_MICROMIPS
 
 menu "CPU Power Management"
 
@@ -3183,5 +3187,3 @@ source "drivers/cpuidle/Kconfig"
 endmenu
 
 source "arch/mips/kvm/Kconfig"
-
-source "arch/mips/vdso/Kconfig"
diff --git a/arch/mips/vdso/Kconfig b/arch/mips/vdso/Kconfig
deleted file mode 100644
index 7014024..0000000
--- a/arch/mips/vdso/Kconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-# GCC (at least up to version 9.2) appears to emit function calls that make use
-# of the GOT when targeting microMIPS, which we can't use in the VDSO due to
-# the lack of relocations. As such, we disable the VDSO for microMIPS builds.
-
-config MIPS_DISABLE_VDSO
-	def_bool CPU_MICROMIPS
diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile
index 69d4593..00d3ba2 100644
--- a/arch/mips/vdso/Makefile
+++ b/arch/mips/vdso/Makefile
@@ -4,7 +4,7 @@
 # Include the generic Makefile to check the built vdso.
 include $(srctree)/lib/vdso/Makefile.include
 
-obj-vdso-y := elf.o vgettimeofday.o sigreturn.o
+obj-vdso-y := elf.o sigreturn.o
 
 # Common compiler flags between ABIs.
 ccflags-vdso := \
@@ -36,6 +36,7 @@ aflags-vdso := $(ccflags-vdso) \
 	-D__ASSEMBLY__ -Wa,-gdwarf-2
 
 ifneq ($(c-gettimeofday-y),)
+obj-vdso-y += vgettimeofday.o
 CFLAGS_vgettimeofday.o = -include $(c-gettimeofday-y)
 
 # config-n32-o32-env.c prepares the environment to build a 32bit vDSO
@@ -47,10 +48,6 @@ endif
 
 CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE)
 
-ifdef CONFIG_MIPS_DISABLE_VDSO
-  obj-vdso-y := $(filter-out vgettimeofday.o, $(obj-vdso-y))
-endif
-
 # VDSO linker flags.
 ldflags-y := -Bsymbolic --no-undefined -soname=linux-vdso.so.1 \
 	$(filter -E%,$(KBUILD_CFLAGS)) -shared \
diff --git a/arch/mips/vdso/vdso.lds.S b/arch/mips/vdso/vdso.lds.S
index 5d08be3..fd263b0 100644
--- a/arch/mips/vdso/vdso.lds.S
+++ b/arch/mips/vdso/vdso.lds.S
@@ -94,7 +94,7 @@ PHDRS
 VERSION
 {
 	LINUX_2.6 {
-#ifndef CONFIG_MIPS_DISABLE_VDSO
+#ifdef CONFIG_GENERIC_GETTIMEOFDAY
 	global:
 		__vdso_clock_gettime;
 #ifdef CONFIG_MIPS_CLOCK_VSYSCALL

  parent reply	other threads:[~2026-06-09 15:04 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-21  6:53 [PATCH 0/9] MIPS: VDSO: Clean up vDSO Kconfig Thomas Weißschuh
2026-05-21  6:53 ` [PATCH 1/9] MAINTAINERS: Add include/linux/vdso_datastore.h to vDSO block Thomas Weißschuh
2026-06-04 16:24   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-05-21  6:53 ` [PATCH 2/9] vdso/datastore: Always provide symbol declarations Thomas Weißschuh
2026-06-04 16:24   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-05-21  6:53 ` [PATCH 3/9] MIPS: Introduce Kconfig MIPS_GENERIC_GETTIMEOFDAY Thomas Weißschuh
2026-06-04 16:24   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-05-21  6:53 ` [PATCH 4/9] MIPS: VDSO: Only map the data pages when the vDSO is used Thomas Weißschuh
2026-06-04 16:24   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-05-21  6:53 ` [PATCH 5/9] MIPS: csrc-r4k: Only use VDSO_CLOCKMODE_R4K when it is a available Thomas Weißschuh
2026-06-04 16:24   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-06-05  7:59     ` Thomas Weißschuh
2026-06-09 15:04   ` tip-bot2 for Thomas Weißschuh
2026-05-21  6:53 ` [PATCH 6/9] clocksource/drivers/mips-gic-timer: Only use VDSO_CLOCKMODE_GIC " Thomas Weißschuh
2026-06-04 16:24   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-06-09 15:04   ` tip-bot2 for Thomas Weißschuh
2026-05-21  6:53 ` [PATCH 7/9] MIPS: VDSO: Fold MIPS_DISABLE_VDSO into MIPS_GENERIC_GETTIMEOFDAY Thomas Weißschuh
2026-06-04 16:24   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-06-09 15:04   ` tip-bot2 for Thomas Weißschuh [this message]
2026-05-21  6:53 ` [PATCH 8/9] MIPS: VDSO: Gate microMIPS restriction on GCC version Thomas Weißschuh
2026-06-04 16:24   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-06-09 15:04   ` tip-bot2 for Thomas Weißschuh
2026-05-21  6:53 ` [PATCH 9/9] MIPS: VDSO: Fold MIPS_CLOCK_VSYSCALL into MIPS_GENERIC_GETTIMEOFDAY Thomas Weißschuh
2026-06-04 16:24   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-06-09 15:03   ` tip-bot2 for Thomas Weißschuh

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178101744261.529383.4172241930455809223.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=arnd@arndb.de \
    --cc=daniel.lezcano@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=luto@kernel.org \
    --cc=tglx@kernel.org \
    --cc=thomas.weissschuh@linutronix.de \
    --cc=tsbogend@alpha.franken.de \
    --cc=vincenzo.frascino@arm.com \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®