diff mbox

[committed] Use index_cpu_RTM and reg_RTM to clear the bit_cpu_RTM bit

Message ID 20170217195615.GA26684@intel.com
State New
Headers show

Commit Message

H.J. Lu Feb. 17, 2017, 7:56 p.m. UTC 
Tested on x86-64.  elf/ld.so and libc.so are identical before and after
the change.

H.J.
---
	* 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 mbox

Patch

diff --git a/ChangeLog b/ChangeLog
index daa26c8..c846949 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@ 
+2017-02-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* 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  <joseph@codesourcery.com>
 
 	* 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 1c714a4..4e8f179 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;
 	    }
 	}