tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'kbuild-fixes-v5.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull more Kbuild fixes from Masahiro Yamada:

- fix scripts/kallsyms.c to correctly check too long symbol names

- fix sh build error for the combination of CONFIG_OF_EARLY_FLATTREE=y
and CONFIG_USE_BUILTIN_DTB=n

* tag 'kbuild-fixes-v5.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
sh: fix build error for invisible CONFIG_BUILTIN_DTB_SOURCE
kallsyms: Handle too long symbols in kallsyms.c

Linus Torvalds 77dc1181 6ee2846c

+3 -3
+1 -1
arch/sh/boot/dts/Makefile
··· 1 1 ifneq ($(CONFIG_BUILTIN_DTB_SOURCE),"") 2 - obj-y += $(patsubst "%",%,$(CONFIG_BUILTIN_DTB_SOURCE)).dtb.o 2 + obj-$(CONFIG_USE_BUILTIN_DTB) += $(patsubst "%",%,$(CONFIG_BUILTIN_DTB_SOURCE)).dtb.o 3 3 endif
+2 -2
scripts/kallsyms.c
··· 118 118 fprintf(stderr, "Read error or end of file.\n"); 119 119 return -1; 120 120 } 121 - if (strlen(sym) > KSYM_NAME_LEN) { 122 - fprintf(stderr, "Symbol %s too long for kallsyms (%zu vs %d).\n" 121 + if (strlen(sym) >= KSYM_NAME_LEN) { 122 + fprintf(stderr, "Symbol %s too long for kallsyms (%zu >= %d).\n" 123 123 "Please increase KSYM_NAME_LEN both in kernel and kallsyms.c\n", 124 124 sym, strlen(sym), KSYM_NAME_LEN); 125 125 return -1;