diff --git a/ChangeLog b/ChangeLog index 0e22a702e9..8a6c668fb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2015-06-30 Torvald Riegel + * nptl/DESIGN-systemtap-probes.txt: Remove lll_lock_wait, + lll_lock_wait_private and lll_futex_wake probes. + * sysdeps/unix/sysv/linux/i386/lowlevellock.h (BUSY_WAIT_NOP): Remove. * sysdeps/unix/sysv/linux/x86_64/lowlevellock.h (BUSY_WAIT_NOP): Likewise. diff --git a/nptl/DESIGN-systemtap-probes.txt b/nptl/DESIGN-systemtap-probes.txt index 16d7c45134..ac972a9542 100644 --- a/nptl/DESIGN-systemtap-probes.txt +++ b/nptl/DESIGN-systemtap-probes.txt @@ -53,22 +53,6 @@ rdlock_acquire_read - probe for pthread_rwlock_rdlock after successfully getting rwlock_unlock - probe for pthread_rwlock_unlock arg1 = address of rw lock -lll_lock_wait - probe in low-level (assembly language) locking code, only fired - when futex/FUTEX_WAIT is called (i.e. when trying to acquire a - contented lock) - arg1 = pointer to futex - arg2 = flags passed to the futex system call -lll_lock_wait_private - probe in low-level (assembly language) locking code, - only fired when futex/FUTEX_WAIT is called (i.e. when - trying to acquire a contented lock) - arg1 = pointer to futex - -lll_futex_wake - probe in low-level (assembly language) locking code, only fired - when futex (FUTEX_WAKE) is called - arg1 = pointer to futex - arg2 = number of processes to wake - arg3 = additional flags - Condition variable Probes ========================= cond_init - probe for pthread_cond_init