summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Mork <bjorn@mork.no>2014-12-23 12:57:43 +0100
committerIngo Molnar <mingo@kernel.org>2014-12-23 15:37:06 +0100
commit280dbc572357eb50184663fc9e4aaf09c8141e9b (patch)
treec781fe93526470f7e7e086c57e8c3739c3d4a0f6
parentea174f4c4f6135e30a4e1e8c4511980338238b16 (diff)
downloadlinux-stable-280dbc572357eb50184663fc9e4aaf09c8141e9b.tar.gz
linux-stable-280dbc572357eb50184663fc9e4aaf09c8141e9b.tar.bz2
linux-stable-280dbc572357eb50184663fc9e4aaf09c8141e9b.zip
x86/build: Clean auto-generated processor feature files
Commit 9def39be4e96 ("x86: Support compiling out human-friendly processor feature names") made two source file targets conditional. Such conditional targets will not be cleaned automatically by make mrproper. Fix by adding explicit clean-files targets for the two files. Fixes: 9def39be4e96 ("x86: Support compiling out human-friendly processor feature names") Signed-off-by: Bjørn Mork <bjorn@mork.no> Cc: Josh Triplett <josh@joshtriplett.org> Link: http://lkml.kernel.org/r/1419335863-10608-1-git-send-email-bjorn@mork.no Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--arch/x86/boot/Makefile1
-rw-r--r--arch/x86/kernel/cpu/Makefile1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index 5b016e2498f3..3db07f30636f 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -51,6 +51,7 @@ targets += cpustr.h
$(obj)/cpustr.h: $(obj)/mkcpustr FORCE
$(call if_changed,cpustr)
endif
+clean-files += cpustr.h
# ---------------------------------------------------------------------------
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index e27b49d7c922..80091ae54c2b 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -66,3 +66,4 @@ targets += capflags.c
$(obj)/capflags.c: $(cpufeature) $(src)/mkcapflags.sh FORCE
$(call if_changed,mkcapflags)
endif
+clean-files += capflags.c