From 4f9879f6c6454f255cb81b7a34dd35e355679f4b Mon Sep 17 00:00:00 2001 From: Ramkumar Ramachandra Date: Wed, 10 Jul 2013 23:33:38 +0530 Subject: scripts: remove unused function in sortextable.c Signed-off-by: Ramkumar Ramachandra Acked-by: David Daney Signed-off-by: Michal Marek diff --git a/scripts/sortextable.c b/scripts/sortextable.c index f9ce116..7c2310c 100644 --- a/scripts/sortextable.c +++ b/scripts/sortextable.c @@ -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 -- cgit v0.10.2 From 0d0e7718a9da789dec7932b7411ab16047540c4f Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Thu, 11 Jul 2013 15:34:51 +0200 Subject: kbuild: Do not overwrite include/config/kernel.release needlessly Use filechk to detect if the content changed or not. Signed-off-by: Michal Marek diff --git a/Makefile b/Makefile index 9262ba8..cf89776 100644 --- a/Makefile +++ b/Makefile @@ -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 -- cgit v0.10.2