diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-08 17:24:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-08 17:24:44 -0700 |
| commit | c83b5d321b58794b8469d57990dc3884cbcd289e (patch) | |
| tree | ab5706cdcdafd45ef0b284f5d898028b362e0e7e | |
| parent | a1aab6f3d295f078c008893ee7fa2c011626c46f (diff) | |
| parent | 87b61864d7ab2aec5c212ff18950d4972f0dfb4e (diff) | |
| download | linux-c83b5d321b58794b8469d57990dc3884cbcd289e.tar.bz2 | |
Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
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
| -rw-r--r-- | arch/x86/kernel/cpu/Makefile | 3 | ||||
| -rw-r--r-- | arch/x86/kernel/cpu/mkcapflags.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index 4b4eb06e117c..89e76523cedc 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -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 diff --git a/arch/x86/kernel/cpu/mkcapflags.sh b/arch/x86/kernel/cpu/mkcapflags.sh index d0dfb892c72f..aed45b8895d5 100644 --- a/arch/x86/kernel/cpu/mkcapflags.sh +++ b/arch/x86/kernel/cpu/mkcapflags.sh @@ -4,6 +4,8 @@ # Generate the x86_cap/bug_flags[] arrays from include/asm/cpufeatures.h # +set -e + IN=$1 OUT=$2 |