[tip:x86/cpufeature] x86, cpu: Kill cpu_has_mp

From: tip-bot for Borislav Petkov
Date: Mon Jul 14 2014 - 15:25:30 EST

Commit-ID: af0fa6f6b5851761e9fbf79eb14ba86e857b4e7b
Gitweb: http://git.kernel.org/tip/af0fa6f6b5851761e9fbf79eb14ba86e857b4e7b
Author: Borislav Petkov <bp@xxxxxxx>
AuthorDate: Tue, 24 Jun 2014 13:25:05 +0200
Committer: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
CommitDate: Mon, 14 Jul 2014 12:21:40 -0700

x86, cpu: Kill cpu_has_mp

It was used only for checking for some K7s which didn't have MP support,


and it was unconditionally set on 64-bit for no reason. Kill it.

Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Link: http://lkml.kernel.org/r/1403609105-8332-4-git-send-email-bp@xxxxxxxxx
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
arch/x86/include/asm/cpufeature.h | 4 ----
1 file changed, 4 deletions(-)

diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
index 327a061..bb9b258 100644
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@ -315,7 +315,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
#define cpu_has_avx boot_cpu_has(X86_FEATURE_AVX)
#define cpu_has_avx2 boot_cpu_has(X86_FEATURE_AVX2)
#define cpu_has_ht boot_cpu_has(X86_FEATURE_HT)
-#define cpu_has_mp boot_cpu_has(X86_FEATURE_MP)
#define cpu_has_nx boot_cpu_has(X86_FEATURE_NX)
#define cpu_has_k6_mtrr boot_cpu_has(X86_FEATURE_K6_MTRR)
#define cpu_has_cyrix_arr boot_cpu_has(X86_FEATURE_CYRIX_ARR)
@@ -362,9 +361,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
#undef cpu_has_pae
#define cpu_has_pae ___BUG___

-#undef cpu_has_mp
-#define cpu_has_mp 1
#undef cpu_has_k6_mtrr
#define cpu_has_k6_mtrr 0

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/