x86/build: use the proper name CONFIG_FW_LOADER
Subsystems (2)
PATCH 1/1 x86/build: use the proper name CONFIG_FW_LOADER
Commit c8dcf655ec81 ("x86/build: Tuck away built-in firmware under FW_LOADER") intends to add the expression regex only when FW_LOADER is built-in, not a module or disabled.
The config is called CONFIG_FW_LOADER when it is built-in; and CONFIG_FW_LOADER_MODULE when it is a module.
So, adjust the condition to the actual name of the config.
---
I am wondering if this regular expression needs to be made differently depending on the build configuration at all.
Could this not just be added unconditionally anyway or is not needed at all? It seems that is was broken since its initial inclusion and nobody ever noticed.
arch/x86/tools/relocs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/tools/relocs.c +1 -1
@@ -68,7 +68,7 @@ static const char * const sym_regex_kernel[S_NSYMTYPES] = { "(__parainstructions|__alt_instructions)(_end)?|" "(__iommu_table|__apicdrivers|__smp_locks)(_end)?|" "__(start|end)_pci_.*|" -#if CONFIG_FW_LOADER_BUILTIN +#if CONFIG_FW_LOADER "__(start|end)_builtin_fw|" #endif"__(start|stop)___ksymtab(_gpl)?|"
Signature · 1 line
2.17.1
Quoted 11 lines · Lukas Bulwahn
Commit
c8dcf655ec81("x86/build: Tuck away built-in firmware underFW_LOADER") intends to add the expression regex only whenFW_LOADERis built-in, not a module or disabled.The config is called
CONFIG_FW_LOADERwhen it is built-in; andCONFIG_FW_LOADER_MODULEwhen it is a module.So, adjust the condition to the actual name of the config.
Fixes c8dcf655ec81 ("x86/build: Tuck away built-in firmware under FW_LOADER")Signed-off-by Lukas Bulwahn <[email protected]>
Quoted 7 lines
---
I am wondering if this regular expression needs to be made differently depending on the build configuration at all.
Could this not just be added unconditionally anyway or is not needed at all? It seems that is was broken since its initial inclusion and nobody ever noticed.
Very few people use built-in firmware, which is why no one probably ever noticed this :(
Borislav Petkov
maintainerQuoted 6 lines · Lukas Bulwahn
Commit
c8dcf655ec81("x86/build: Tuck away built-in firmware underFW_LOADER") intends to add the expression regex only whenFW_LOADERis built-in, not a module or disabled.The config is called
CONFIG_FW_LOADERwhen it is built-in; andCONFIG_FW_LOADER_MODULEwhen it is a module.
$ git grep FW_LOADER_MODULE include/linux/firmware.h:37:#if defined(CONFIG_FW_LOADER) || (defined(CONFIG_FW_LOADER_MODULE) && defined(MODULE))
So either I'm not grepping right or that FW_LOADER_MODULE thing belongs to the past...
Greg, Luis, what's up?
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteQuoted 8 lines · Borislav Petkov
Quoted 6 lines · Lukas Bulwahn
Commit
c8dcf655ec81("x86/build: Tuck away built-in firmware underFW_LOADER") intends to add the expression regex only whenFW_LOADERis built-in, not a module or disabled.The config is called
CONFIG_FW_LOADERwhen it is built-in; andCONFIG_FW_LOADER_MODULEwhen it is a module.
Quoted 7 lines
$ git grep FW_LOADER_MODULE include/linux/firmware.h:37:#if defined(CONFIG_FW_LOADER) || (defined(CONFIG_FW_LOADER_MODULE) && defined(MODULE))So either I'm not grepping right or that
FW_LOADER_MODULEthing belongs to the past...Greg, Luis, what's up?
Looks like a pre-git thing, it is obviously not a valid config option, so it can be removed. I'll go make a patch for it...
thanks,
greg k-h
[tip: x86/urgent] x86/build: Use the proper name CONFIG_FW_LOADER
In reply to Lukas BulwahnThe following commit has been merged into the x86/urgent branch of tip:
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: d6f12f83989bb356ac6880a954f62c7667e35066 Gitweb: https://git.kernel.org/tip/d6f12f83989bb356ac6880a954f62c7667e35066 Author: Lukas Bulwahn <[email protected]> AuthorDate: Wed, 29 Dec 2021 12:15:53 +01:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Wed, 29 Dec 2021 22:20:38 +01:00
x86/build: Use the proper name CONFIG_FW_LOADER
Commit in Fixes intends to add the expression regex only when FW_LOADER is enabled - not FW_LOADER_BUILTIN. Latter is a leftover from a previous patchset and not a valid config item.
So, adjust the condition to the actual name of the config.
[ bp: Cleanup commit message. ]
--- arch/x86/tools/relocs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/tools/relocs.c +1 -1
@@ -68,7 +68,7 @@ static const char * const sym_regex_kernel[S_NSYMTYPES] = { "(__parainstructions|__alt_instructions)(_end)?|" "(__iommu_table|__apicdrivers|__smp_locks)(_end)?|" "__(start|end)_pci_.*|" -#if CONFIG_FW_LOADER_BUILTIN +#if CONFIG_FW_LOADER "__(start|end)_builtin_fw|" #endif"__(start|stop)___ksymtab(_gpl)?|"