From: H. Peter Anvin <hpa@linux.intel.com>
Date: Thu, 27 Feb 2014 16:36:31 +0000 (-0800)
Subject: x86, cpufeature: If we disable CLFLUSH, we should disable CLFLUSHOPT
X-Git-Tag: MMI-PSA29.97-13-9~12518^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=da4aaa7d860c63a1bfd3c73cf8309afe2840c5b9;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

x86, cpufeature: If we disable CLFLUSH, we should disable CLFLUSHOPT

If we explicitly disable the use of CLFLUSH, we should disable the use
of CLFLUSHOPT as well.

Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Link: http://lkml.kernel.org/n/tip-jtdv7btppr4jgzxm3sxx1e74@git.kernel.org
---

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 2c6ac6f2b5b1..cca53d88762a 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1026,6 +1026,7 @@ __setup("show_msr=", setup_show_msr);
 static __init int setup_noclflush(char *arg)
 {
 	setup_clear_cpu_cap(X86_FEATURE_CLFLUSH);
+	setup_clear_cpu_cap(X86_FEATURE_CLFLUSHOPT);
 	return 1;
 }
 __setup("noclflush", setup_noclflush);