about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/linux/x86/elision-conf.h1
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d1cd0f5d6..51c6fef0a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2015-08-13  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* sysdeps/unix/sysv/linux/x86/elision-conf.h: Don't include
+	<cpuid.h>.
+
+2015-08-13  H.J. Lu  <hongjiu.lu@intel.com>
+
 	* sysdeps/unix/sysv/linux/x86/elision-conf.c (elision_init):
 	Replace HAS_RTM with HAS_CPU_FEATURE (RTM).
 
diff --git a/sysdeps/unix/sysv/linux/x86/elision-conf.h b/sysdeps/unix/sysv/linux/x86/elision-conf.h
index 186df3d0bb..6967431336 100644
--- a/sysdeps/unix/sysv/linux/x86/elision-conf.h
+++ b/sysdeps/unix/sysv/linux/x86/elision-conf.h
@@ -19,7 +19,6 @@
 #define _ELISION_CONF_H 1
 
 #include <pthread.h>
-#include <cpuid.h>
 #include <time.h>
 
 /* Should make sure there is no false sharing on this.  */