x86/build: Tuck away built-in firmware under FW_LOADER

When FW_LOADER is modular or disabled we don't use it.
Update x86 relocs to reflect that.

Reviewed-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20211021155843.1969401-7-mcgrof@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
index 27c82207d387813ecf7fdbb39eafd221a482935b..ab3554d4aa0644ba4c0afc4952037aecbc48773f 100644 (file)
--- a/arch/x86/tools/relocs.c
+++ b/arch/x86/tools/relocs.c
@@ -63,7 +63,9 @@ 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
        "__(start|end)_builtin_fw|"
+#endif
        "__(start|stop)___ksymtab(_gpl)?|"
        "__(start|stop)___kcrctab(_gpl)?|"
        "__(start|stop)___param|"