diff options
| author | Dominik Vogt <vogt@de.ibm.com> | 2013-07-19 05:02:44 +0000 |
|---|---|---|
| committer | Carlos O'Donell <carlos@redhat.com> | 2013-07-19 02:23:28 -0400 |
| commit | d3d3ce982a61f4a657589f7fa0a979e9e907580d (patch) | |
| tree | 2a584dcdfe964427015e69d73022a1fa22645190 | |
| parent | d7e06450b9d730d7b62ba52f611585810fa902df (diff) | |
| download | glibc-d3d3ce982a61f4a657589f7fa0a979e9e907580d.tar.gz glibc-d3d3ce982a61f4a657589f7fa0a979e9e907580d.tar.xz glibc-d3d3ce982a61f4a657589f7fa0a979e9e907580d.zip | |
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.
| -rw-r--r-- | nptl/ChangeLog | 8 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c | 10 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86/elision-conf.h | 1 |
3 files changed, 8 insertions, 11 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 064e431c18..8aeee8f32e 100644 --- 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 118cfa72f5..822d4bd1b6 100644 --- 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 55b81db930..6fa26973dc 100644 --- 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; |