2014-12-23 12:03:13

by Bjørn Mork

Subject: [PATCH] x86: 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")
Cc: Josh Triplett <[email protected]>
Signed-off-by: Bjørn Mork <[email protected]>
---
arch/x86/boot/Makefile | 1 +
arch/x86/kernel/cpu/Makefile | 1 +
2 files changed, 2 insertions(+)

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
--
2.1.3

2014-12-23 14:40:07

by tip-bot for Vasyl Gomonovych

Subject: [tip:x86/urgent] x86/build: Clean auto-generated processor feature files

Commit-ID: 280dbc572357eb50184663fc9e4aaf09c8141e9b
Gitweb: http://git.kernel.org/tip/280dbc572357eb50184663fc9e4aaf09c8141e9b
Author: Bjørn Mork <[email protected]>
AuthorDate: Tue, 23 Dec 2014 12:57:43 +0100
Committer: Ingo Molnar <[email protected]>
CommitDate: Tue, 23 Dec 2014 15:37:06 +0100

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 <[email protected]>
Cc: Josh Triplett <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
arch/x86/boot/Makefile | 1 +
arch/x86/kernel/cpu/Makefile | 1 +
2 files changed, 2 insertions(+)

diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index 5b016e2..3db07f3 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 e27b49d..80091ae 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