Commit 1ff5e37e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

Pull kbuild update from Michal Marek:
 "Only these two commits are in the kbuild branch this time:
   - Using filechk for include/config/kernel.release
   - Cleanup in scripts/sortextable.c"

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kbuild: Do not overwrite include/config/kernel.release needlessly
  scripts: remove unused function in sortextable.c
parents e7d33bb5 0d0e7718

Makefile

+5 −2
Original line number Diff line number Diff line
@@ -794,10 +794,13 @@ PHONY += $(vmlinux-dirs) 
$(vmlinux-dirs): prepare scripts

	$(Q)$(MAKE) $(build)=$@



define filechk_kernel.release

	echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))"

endef



# Store (new) KERNELRELEASE string in include/config/kernel.release

include/config/kernel.release: include/config/auto.conf FORCE

	$(Q)rm -f $@

	$(Q)echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))" > $@

	$(call filechk,kernel.release)





# Things we need to do before we recursively start building the kernel

scripts/sortextable.c

+0 −8
Original line number Diff line number Diff line
@@ -64,14 +64,6 @@ fail_file(void) 
	longjmp(jmpenv, SJ_FAIL);

}



static void __attribute__((noreturn))

succeed_file(void)

{

	cleanup();

	longjmp(jmpenv, SJ_SUCCEED);

}





/*

 * Get the whole file as a programming convenience in order to avoid

 * malloc+lseek+read+free of many pieces.  If successful, then mmap

CRA Git | Maintained and supported by SUSTech CRA and CCSE