Skip to contentSkip to conversation

kbuild, rust: use -fremap-path-prefix to make paths relative

PATCH New Sasha Levin 1 participant 3 messages Apr 8, 2025

Subsystems (3)
lore
Share & tools
lore

Sasha Levin

author maintainer
#0 lore raw

PATCH 1/3 kbuild, rust: use -fremap-path-prefix to make paths relative

From: Thomas Weißschuh <[email protected]>

[ Upstream commit dbdffaf50ff9cee3259a7cef8a7bd9e0f0ba9f13 ]

Remap source path prefixes in all output, including compiler diagnostics, debug information, macro expansions, etc. This removes a few absolute paths from the binary and also makes it possible to use core::panic::Location properly.

Equivalent to the same configuration done for C sources in commit 1d3730f0012f ("kbuild: support -fmacro-prefix-map for external modules") and commit a73619a845d5 ("kbuild: use -fmacro-prefix-map to make __FILE__ a relative path").

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)
Makefile +1 -0
index 21a34e8991ac6..9c1b66bf4bf6e 100644
@@ -1067,6 +1067,7 @@ endif
 # change __FILE__ to the relative path to the source directory
 ifdef building_out_of_srctree
 KBUILD_CPPFLAGS += $(call cc-option,-fmacro-prefix-map=$(srcroot)/=)
+KBUILD_RUSTFLAGS += --remap-path-prefix=$(srcroot)/=
 endif
 
 # include additional Makefiles when needed
Signature · 1 line
2.39.5
author maintainer
#1 lore raw

PATCH 2/3 kbuild: add dependency from vmlinux to sorttable

From: Xi Ruoyao <[email protected]>

[ Upstream commit 82c09de2d4c472ab1b973e6e033671020691e637 ]

Without this dependency it's really puzzling when we bisect for a "bad" commit in a series of sorttable change: when "git bisect" switches to another commit, "make" just does nothing to vmlinux.

---
 scripts/Makefile.vmlinux | 4 ++++
 1 file changed, 4 insertions(+)
scripts/Makefile.vmlinux +4 -0
index 873caaa553134..fb79fd6b24654 100644
@@ -79,6 +79,10 @@ ifdef CONFIG_DEBUG_INFO_BTF
 vmlinux: $(RESOLVE_BTFIDS)
 endif
 
+ifdef CONFIG_BUILDTIME_TABLE_SORT
+vmlinux: scripts/sorttable
+endif
+
 # module.builtin.ranges
 # ---------------------------------------------------------------------------
 ifdef CONFIG_BUILTIN_MODULE_RANGES
Signature · 1 line
2.39.5
author maintainer
#2 lore raw

PATCH 3/3 sched/isolation: Make CONFIG_CPU_ISOLATION depend on CONFIG_SMP

In reply to Sasha Levin

From: Oleg Nesterov <[email protected]>

[ Upstream commit 975776841e689dd8ba36df9fa72ac3eca3c2957a ]

kernel/sched/isolation.c obviously makes no sense without CONFIG_SMP, but the Kconfig entry we have right now:

	config CPU_ISOLATION
		bool "CPU isolation"
		depends on SMP || COMPILE_TEST

allows the creation of pointless .config's which cause build failures.

---
 init/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
init/Kconfig +1 -1
index 4c88cb58c261c..4719516ee8b48 100644
@@ -703,7 +703,7 @@ endmenu # "CPU/Task time and stats accounting"
 
 config CPU_ISOLATION
 	bool "CPU isolation"
-	depends on SMP || COMPILE_TEST
+	depends on SMP
 	default y
 	help
 	  Make sure that CPUs running critical tasks are not disturbed by
Signature · 1 line
2.39.5