diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-08-07 19:03:02 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-08-07 19:03:02 +0200 |
| commit | 4972bb90c3956817c8e0eea15a348ab635d1acdd (patch) | |
| tree | 7ee587325e462fbd85e986d5907ec389c0594763 /arch/x86/tools/relocs.c | |
| parent | Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | kbuild: cancel sub_make_done for the install target to fix DKMS (diff) | |
| download | linux-4972bb90c3956817c8e0eea15a348ab635d1acdd.tar.xz linux-4972bb90c3956817c8e0eea15a348ab635d1acdd.zip | |
Merge tag 'kbuild-fixes-v5.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild fixes from Masahiro Yamada:
- Correct the Extended Regular Expressions in tools
- Adjust scripts/checkversion.pl for the current Kbuild
- Unset sub_make_done for 'make install' to make DKMS work again
* tag 'kbuild-fixes-v5.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
kbuild: cancel sub_make_done for the install target to fix DKMS
scripts: checkversion: modernize linux/version.h search strings
mips: Fix non-POSIX regexp
x86/tools/relocs: Fix non-POSIX regexp
Diffstat (limited to 'arch/x86/tools/relocs.c')
| -rw-r--r-- | arch/x86/tools/relocs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c index 04c5a44b9682..9ba700dc47de 100644 --- a/arch/x86/tools/relocs.c +++ b/arch/x86/tools/relocs.c @@ -57,12 +57,12 @@ static const char * const sym_regex_kernel[S_NSYMTYPES] = { [S_REL] = "^(__init_(begin|end)|" "__x86_cpu_dev_(start|end)|" - "(__parainstructions|__alt_instructions)(|_end)|" - "(__iommu_table|__apicdrivers|__smp_locks)(|_end)|" + "(__parainstructions|__alt_instructions)(_end)?|" + "(__iommu_table|__apicdrivers|__smp_locks)(_end)?|" "__(start|end)_pci_.*|" "__(start|end)_builtin_fw|" - "__(start|stop)___ksymtab(|_gpl)|" - "__(start|stop)___kcrctab(|_gpl)|" + "__(start|stop)___ksymtab(_gpl)?|" + "__(start|stop)___kcrctab(_gpl)?|" "__(start|stop)___param|" "__(start|stop)___modver|" "__(start|stop)___bug_table|" |