Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77dc1181 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-v5.0-2' of... 

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
parents 6ee2846c 207a369e

arch/sh/boot/dts/Makefile

+1 −1
Original line number Diff line number Diff line 
ifneq ($(CONFIG_BUILTIN_DTB_SOURCE),"")

obj-y += $(patsubst "%",%,$(CONFIG_BUILTIN_DTB_SOURCE)).dtb.o

obj-$(CONFIG_USE_BUILTIN_DTB) += $(patsubst "%",%,$(CONFIG_BUILTIN_DTB_SOURCE)).dtb.o

endif

scripts/kallsyms.c

+2 −2
Original line number Diff line number Diff line
@@ -118,8 +118,8 @@ static int read_symbol(FILE *in, struct sym_entry *s) 
			fprintf(stderr, "Read error or end of file.\n");

		return -1;

	}

	if (strlen(sym) > KSYM_NAME_LEN) {

		fprintf(stderr, "Symbol %s too long for kallsyms (%zu vs %d).\n"

	if (strlen(sym) >= KSYM_NAME_LEN) {

		fprintf(stderr, "Symbol %s too long for kallsyms (%zu >= %d).\n"

				"Please increase KSYM_NAME_LEN both in kernel and kallsyms.c\n",

			sym, strlen(sym), KSYM_NAME_LEN);

		return -1;