Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (c83b5d32) · Commits · 戴 / test

Pull x86 build updates from Ingo Molnar: "Two kbuild enhancements by Masahiro Yamada" * 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/build: Remove redundant 'clean-files += capflags.c' x86/build: Add 'set -e' to mkcapflags.sh to delete broken capflags.c

arch/x86/kernel/cpu/Makefile

+1 −2

Original line number	Diff line number	Diff line
		@@ -56,8 +56,7 @@ quiet_cmd_mkcapflags = MKCAP $@

		cpufeature = $(src)/../../include/asm/cpufeatures.h

		targets += capflags.c
		$(obj)/capflags.c: $(cpufeature) $(src)/mkcapflags.sh FORCE
		$(call if_changed,mkcapflags)
		endif
		clean-files += capflags.c
		targets += capflags.c

arch/x86/kernel/cpu/mkcapflags.sh

+2 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,8 @@
		# Generate the x86_cap/bug_flags[] arrays from include/asm/cpufeatures.h
		#

		set -e

		IN=$1
		OUT=$2

Admin message