[tip: x86/urgent] x86/build: Use the proper name CONFIG_FW_LOADER

From: tip-bot2 for Lukas Bulwahn
Date: Wed Dec 29 2021 - 16:30:44 EST


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 <lukas.bulwahn@xxxxxxxxx>
AuthorDate: Wed, 29 Dec 2021 12:15:53 +01:00
Committer: Borislav Petkov <bp@xxxxxxx>
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. ]

Fixes: c8dcf655ec81 ("x86/build: Tuck away built-in firmware under FW_LOADER")
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@xxxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Reviewed-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20211229111553.5846-1-lukas.bulwahn@xxxxxxxxx
---
arch/x86/tools/relocs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
index c736cf2..e2c5b29 100644
--- a/arch/x86/tools/relocs.c
+++ b/arch/x86/tools/relocs.c
@@ -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)?|"