From dd395cf1103ec8e26affcf501791505ded4d31c6 Mon Sep 17 00:00:00 2001 From: Carlos O'Donell Date: Thu, 14 Feb 2013 10:34:48 -0500 Subject: hppa: Remove unused lll_unlock_wake_cb. There hasn't been a use for lll_unlock_wake_cb since it was removed globally in 2007-05-29. This patch removes the function from hppa's lowlevellock.[ch] implementation. --- ports/ChangeLog.hppa | 7 +++++++ ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.c | 12 ------------ ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h | 2 -- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/ports/ChangeLog.hppa b/ports/ChangeLog.hppa index ef904c2671..6314f1269a 100644 --- a/ports/ChangeLog.hppa +++ b/ports/ChangeLog.hppa @@ -1,3 +1,10 @@ +2013-02-14 Carlos O'Donell + + * sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.c + (lll_unlock_wake_cb): Remove. + * ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h: + Remove prototype for lll_unlock_wake_cb. + 2013-01-10 Joseph Myers * sysdeps/hppa/fpu/fpu_control.h (_FPU_GETCW): Use __extension__ diff --git a/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.c b/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.c index 618edf7bc2..af63e1b9a8 100644 --- a/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.c +++ b/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.c @@ -86,17 +86,6 @@ __lll_timedlock_wait (lll_lock_t *futex, const struct timespec *abstime, int pri /* These don't get included in libc.so */ #ifdef IS_IN_libpthread -int -lll_unlock_wake_cb (lll_lock_t *futex) -{ - int val = atomic_exchange_rel (futex, 0); - - if (__builtin_expect (val > 1, 0)) - lll_private_futex_wake (futex, 1); - return 0; -} - - int __lll_timedwait_tid (int *tidp, const struct timespec *abstime) { @@ -134,6 +123,5 @@ __lll_timedwait_tid (int *tidp, const struct timespec *abstime) return 0; } - #endif diff --git a/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h b/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h index f37a7bbd74..b88703fbaf 100644 --- a/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h +++ b/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h @@ -317,8 +317,6 @@ __lll_robust_timedlock (int *futex, const struct timespec *abstime, #define THREAD_INIT_LOCK(PD, LOCK) \ (PD)->LOCK = LLL_LOCK_INITIALIZER -extern int lll_unlock_wake_cb (lll_lock_t *__futex) attribute_hidden; - /* The kernel notifies a process which uses CLONE_CHILD_CLEARTID via futex wakeup when the clone terminates. The memory location contains the thread ID while the clone is running and is reset to zero -- cgit 1.4.1