From: H.J. Lu <hjl.tools@gmail.com>
Date: Fri, 17 Feb 2017 19:53:26 +0000 (-0800)
Subject: Use index_cpu_RTM and reg_RTM to clear the bit_cpu_RTM bit
X-Git-Tag: glibc-2.26~772
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52ac22365a332cacf7aa97f1b41b3a0adfaff778;p=thirdparty%2Fglibc.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index daa26c84c3f..c846949c941 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 1c714a4017b..4e8f1790003 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;
 	    }
 	}