summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLuis Chamberlain <mcgrof@kernel.org>2021-10-21 08:58:39 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-10-22 14:14:01 +0200
commitc8dcf655ec81f94e19a41c54b74c907b57350360 (patch)
treeed61e0abdcc7b43462887d5665d79fb21ca28574 /arch
parent771856caf518b477390afab3aa311d74144f148b (diff)
downloadlinux-stable-c8dcf655ec81f94e19a41c54b74c907b57350360.tar.gz
linux-stable-c8dcf655ec81f94e19a41c54b74c907b57350360.tar.bz2
linux-stable-c8dcf655ec81f94e19a41c54b74c907b57350360.zip
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/tools/relocs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
index 27c82207d387..ab3554d4aa06 100644
--- 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|"