From d3d3ce982a61f4a657589f7fa0a979e9e907580d Mon Sep 17 00:00:00 2001 From: Dominik Vogt Date: Fri, 19 Jul 2013 05:02:44 +0000 Subject: [PATCH] Remove remains of rwlock elision which is not implemented yet. Signed-off-by: Carlos O'Donell --- nptl/ 2013-07-19 Dominik Vogt * 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. --- nptl/ChangeLog | 8 ++++++++ nptl/sysdeps/unix/sysv/linux/x86/elision-conf.c | 10 ---------- 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 064e431..8aeee8f 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,11 @@ +2013-07-19 Dominik Vogt + + * 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 * 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 118cfa7..822d4bd 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 55b81db..6fa2697 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; -- 2.7.4