diff options
| author | Nathan Chancellor <nathan@kernel.org> | 2026-09-18 14:21:12 -0700 |
|---|---|---|
| committer | Nathan Chancellor <nathan@kernel.org> | 2026-09-18 14:21:12 -0700 |
| commit | c0a50a8604054d83be35a81261de431e4f06dfd0 (patch) | |
| tree | b5e38ca2f0afbe082440e0e1739a374dcb2ce0f5 /scripts | |
| parent | 47ef078cf9ad37a35b20094a824ec09b845532ff (diff) | |
| parent | 59351365ac271b5e0eb180f211c531476a36221f (diff) | |
| download | linux-next-c0a50a8604054d83be35a81261de431e4f06dfd0.tar.gz linux-next-c0a50a8604054d83be35a81261de431e4f06dfd0.zip | |
Merge tag 'kbuild-fixes-7.3-1' into kbuild-next
Future changes in kbuild-next depend on
281b61d408d4 ("scripts/mksysmap: drop the MODULE_INFO() symbols from kallsyms")
59351365ac27 ("scripts/mksysmap: fix escape of '$' in the __pi_ pattern")
from kbuild-fixes.
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.asm-headers | 2 | ||||
| -rwxr-xr-x | scripts/mksysmap | 4 | ||||
| -rw-r--r-- | scripts/sorttable.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/scripts/Makefile.asm-headers b/scripts/Makefile.asm-headers index b38931314ad7..f1c3d287c14b 100644 --- a/scripts/Makefile.asm-headers +++ b/scripts/Makefile.asm-headers @@ -48,7 +48,7 @@ syscall-y := $(addprefix $(obj)/, $(syscall-y)) generated-y := $(addprefix $(obj)/, $(generated-y)) # Remove stale wrappers when the corresponding files are removed from generic-y -old-headers := $(shell test -d $(obj) && find $(obj) -name *.h) +old-headers := $(shell test -d $(obj) && find $(obj) -name '*.h' ! -name '.*') unwanted := $(filter-out $(generic-y) $(generated-y) $(syscall-y),$(old-headers)) filechk_wrap = echo "\#include <asm-generic/$*.h>" diff --git a/scripts/mksysmap b/scripts/mksysmap index c4531eacde20..856b26ba2ac0 100755 --- a/scripts/mksysmap +++ b/scripts/mksysmap @@ -35,7 +35,7 @@ / __efistub_/d # arm64 local symbols in PIE namespace -/ __pi_\\$/d +/ __pi_\$/d / __pi_\.L/d # arm64 local symbols in non-VHE KVM namespace @@ -83,7 +83,7 @@ / _SDA2_BASE_$/d # MODULE_INFO() -/ __UNIQUE_ID_modinfo[0-9]*$/d +/ __UNIQUE_ID_modinfo_[0-9]*$/d # --------------------------------------------------------------------------- # Ignored patterns diff --git a/scripts/sorttable.c b/scripts/sorttable.c index d8dc2a1b7c31..d7b50581c732 100644 --- a/scripts/sorttable.c +++ b/scripts/sorttable.c @@ -116,7 +116,7 @@ static inline void *get_index(void *start, int entsize, int index) } static int extable_ent_size; -static int long_size; +static int long_size __maybe_unused; #define ERRSTR_MAXSZ 256 |