From 52ac22365a332cacf7aa97f1b41b3a0adfaff778 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 17 Feb 2017 11:53:26 -0800 Subject: [PATCH] Use index_cpu_RTM and reg_RTM to clear the bit_cpu_RTM bit * sysdeps/x86/cpu-features.c (init_cpu_features): Use index_cpu_RTM and reg_RTM to clear the bit_cpu_RTM bit. --- ChangeLog | 5 +++++ sysdeps/x86/cpu-features.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index daa26c84c3..c846949c94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-02-17 H.J. Lu + + * sysdeps/x86/cpu-features.c (init_cpu_features): Use + index_cpu_RTM and reg_RTM to clear the bit_cpu_RTM bit. + 2017-02-17 Joseph Myers * math/auto-libm-test-in: Add tests of catan and catanh. diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c index 1c714a4017..4e8f179000 100644 --- a/sysdeps/x86/cpu-features.c +++ b/sysdeps/x86/cpu-features.c @@ -215,7 +215,7 @@ init_cpu_features (struct cpu_features *cpu_features) with stepping >= 4) to avoid TSX on kernels that weren't updated with the latest microcode package (which disables broken feature by default). */ - cpu_features->cpuid[COMMON_CPUID_INDEX_7].ebx &= ~(bit_cpu_RTM); + cpu_features->cpuid[index_cpu_RTM].reg_RTM &= ~bit_cpu_RTM; break; } } -- 2.43.5