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 daa26c84c3f9f16596de15bf02e30909ce96a207..c846949c9415210407107b83904b2ab62b6266c9 100644 (file)
--- 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 1c714a4017b5db9228a35401b1561e72efc693ce..4e8f1790003b9f188e0af819c2c97d453f168df5 100644 (file)
--- 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;
            }
        }