Remove remains of rwlock elision which is not implemented yet.

Signed-off-by: Carlos O'Donell <carlos@redhat.com>
---

nptl/
2013-07-19  Dominik Vogt  <vogt@de.ibm.com>

	* sysdeps/unix/sysv/linux/x86/elision-conf.c:
	Remove __rwlock_rtm_enabled and __rwlock_rtm_read_retries.
	(elision_init): Don't set __rwlock_rtm_enabled.
	* sysdeps/unix/sysv/linux/x86/elision-conf.h:
	Remove __rwlock_rtm_enabled.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 064e431c18d7bc7b91133d927a444a563dcef860..8aeee8f32ec6a62b0bd0543d27a6982906c8c4b6 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,11 @@
+2013-07-19  Dominik Vogt  <vogt@de.ibm.com>
+
+       * sysdeps/unix/sysv/linux/x86/elision-conf.c:
+       Remove __rwlock_rtm_enabled and __rwlock_rtm_read_retries.
+       (elision_init): Don't set __rwlock_rtm_enabled.
+       * sysdeps/unix/sysv/linux/x86/elision-conf.h:
+       Remove __rwlock_rtm_enabled.
+
 2013-07-03  H.J. Lu  <hongjiu.lu@intel.com>
 
        * sysdeps/unix/sysv/linux/x86/init-arch.c: New file.

diff --git a/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c b/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c
index 118cfa72f50e100551d7d65c7ec4ce97cef43c80..822d4bd1b65408ba9c04f669add8bac59139ceb6 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c
+++ b/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c
@@ -43,15 +43,6 @@ struct elision_config __elision_aconf =
     .skip_trylock_internal_abort = 3,
   };
 
-/* Elided rwlock toggle, set when elision is available and is
-   enabled for rwlocks.  */
-
-int __rwlock_rtm_enabled attribute_hidden;
-
-/* Retries for elided rwlocks on read. Conservative initial value.  */
-
-int __rwlock_rtm_read_retries attribute_hidden = 3;
-
 /* Set when the CPU supports elision. When false elision is never attempted.  */
 
 int __elision_available attribute_hidden;
@@ -73,7 +64,6 @@ elision_init (int argc __attribute__ ((unused)),
   __elision_available = HAS_RTM;
 #ifdef ENABLE_LOCK_ELISION
   __pthread_force_elision = __libc_enable_secure ? 0 : __elision_available;
-  __rwlock_rtm_enabled = __libc_enable_secure ? 0 : __elision_available;
 #endif
 }
 

diff --git a/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.h b/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.h
index 55b81db93037fcd5523d36202275e7d6581c08df..6fa26973dc88595a2ce3a5ef46c317d25c4a661f 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.h
+++ b/nptl/sysdeps/unix/sysv/linux/x86/elision-conf.h
@@ -34,7 +34,6 @@ struct elision_config
 
 extern struct elision_config __elision_aconf attribute_hidden;
 
-extern int __rwlock_rtm_enabled attribute_hidden;
 extern int __elision_available attribute_hidden;
 extern int __pthread_force_elision attribute_hidden;