Commit 1286cc48 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_urgent_for_v5.16_rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fix from Borislav Petkov:

 - Use the proper CONFIG symbol in a preprocessor check.

* tag 'x86_urgent_for_v5.16_rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/build: Use the proper name CONFIG_FW_LOADER
parents 278218f6 d6f12f83

arch/x86/tools/relocs.c

+1 −1
Original line number Diff line number Diff line
@@ -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)?|"