diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-02 20:02:54 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-02 20:02:54 +0300 |
| commit | 1286cc4893cf356ad6c3a042116981e827dd3680 (patch) | |
| tree | d7dbb6724a3c4b1cf35eb37e2855be312a09a8d8 /arch | |
| parent | 278218f6778bc7d6f8b67199446c56cec7ebb841 (diff) | |
| parent | d6f12f83989bb356ac6880a954f62c7667e35066 (diff) | |
| download | linux-1286cc4893cf356ad6c3a042116981e827dd3680.tar.xz | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/tools/relocs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c index c736cf2ac76b..e2c5b296120d 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)?|" |