aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2014-02-27 11:36:31 -0500
committerH. Peter Anvin <hpa@linux.intel.com>2014-02-27 11:36:31 -0500
commitda4aaa7d860c63a1bfd3c73cf8309afe2840c5b9 (patch)
tree3cb150fa6c6f1f9560ab88435a0ab3e4ddfd548d
parent840d2830e6e56b8fdacc7ff12915dd91bf91566b (diff)
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
-rw-r--r--arch/x86/kernel/cpu/common.c1
1 files changed, 1 insertions, 0 deletions
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);
1026static __init int setup_noclflush(char *arg) 1026static __init int setup_noclflush(char *arg)
1027{ 1027{
1028 setup_clear_cpu_cap(X86_FEATURE_CLFLUSH); 1028 setup_clear_cpu_cap(X86_FEATURE_CLFLUSH);
1029 setup_clear_cpu_cap(X86_FEATURE_CLFLUSHOPT);
1029 return 1; 1030 return 1;
1030} 1031}
1031__setup("noclflush", setup_noclflush); 1032__setup("noclflush", setup_noclflush);