Commit 6717e8f9 authored Sep 17, 2025 by Josh Poimboeuf

kbuild: Remove 'kmod_' prefix from __KBUILD_MODNAME



In preparation for the objtool klp diff subcommand, remove the arbitrary
'kmod_' prefix from __KBUILD_MODNAME and instead add it explicitly in
the __initcall_id() macro.

This change supports the standardization of "unique" symbol naming by
ensuring the non-unique portion of the name comes before the unique
part.  That will enable objtool to properly correlate symbols across
builds.

Cc: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Petr Mladek <pmladek@suse.com>
Tested-by: Joe Lawrence <joe.lawrence@redhat.com>
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>

parent c2d42079

include/linux/init.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -200,12 +200,13 @@ extern struct module __this_module;

		/* Format: <modname>__<counter>_<line>_<fn> */
		#define __initcall_id(fn) \
		__PASTE(kmod_, \
		__PASTE(__KBUILD_MODNAME, \
		__PASTE(__, \
		__PASTE(__COUNTER__, \
		__PASTE(_, \
		__PASTE(__LINE__, \
		__PASTE(_, fn))))))
		__PASTE(_, fn)))))))

		/* Format: __<prefix>__<iid><id> */
		#define __initcall_name(prefix, __iid, id) \

scripts/Makefile.lib

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ name-fix-token = $(subst $(comma),_,$(subst -,_,$1))
		name-fix = $(call stringify,$(call name-fix-token,$1))
		basename_flags = -DKBUILD_BASENAME=$(call name-fix,$(basetarget))
		modname_flags = -DKBUILD_MODNAME=$(call name-fix,$(modname)) \
		-D__KBUILD_MODNAME=kmod_$(call name-fix-token,$(modname))
		-D__KBUILD_MODNAME=$(call name-fix-token,$(modname))
		modfile_flags = -DKBUILD_MODFILE=$(call stringify,$(modfile))

		_c_flags = $(filter-out $(CFLAGS_REMOVE_$(target-stem).o), \