aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-09-07 19:46:50 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-07 19:46:50 -0700
commit1ff5e37e727be2f575d1a672a1bc4c2595b4752e (patch)
tree7a64165d7ca0f1dc813d98efcbe4898e28a8cdc1
parente7d33bb5ea82922e6ddcfc6b28a630b1a4ced071 (diff)
parent0d0e7718a9da789dec7932b7411ab16047540c4f (diff)
downloadlinux-1ff5e37e727be2f575d1a672a1bc4c2595b4752e.tar.gz
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
-rw-r--r--Makefile7
-rw-r--r--scripts/sortextable.c8
2 files changed, 5 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index fe8204be566..a42f26aa619 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
diff --git a/scripts/sortextable.c b/scripts/sortextable.c
index f9ce1160419..7c2310c5b99 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