summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog5
-rw-r--r--nptl/allocatestack.c1
-rw-r--r--nptl/pthreadP.h2
3 files changed, 7 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index c7af57c8ca..feeae3b711 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-11  Ulrich Drepper  <drepper@redhat.com>
+
+	* allocatestack.c (queue_stack): Always inline.
+	* ptreadhP.h (__do_cancel): Likewise.
+
 2003-06-10  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/sysv/linux/s390/sem_timedwait.c (sem_timedwait): Fix
diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c
index 9653b62cab..bfa5ea1160 100644
--- a/nptl/allocatestack.c
+++ b/nptl/allocatestack.c
@@ -202,6 +202,7 @@ get_cached_stack (size_t *sizep, void **memp)
 /* Add a stack frame which is not used anymore to the stack.  Must be
    called with the cache lock held.  */
 static inline void
+__attribute ((always_inline))
 queue_stack (struct pthread *stack)
 {
   /* We unconditionally add the stack to the list.  The memory may
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index fe982af87b..a979f07f0b 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -116,7 +116,7 @@ extern void __pthread_unwind (__pthread_unwind_buf_t *__buf)
 
 /* Called when a thread reacts on a cancellation request.  */
 static inline void
-__attribute ((noreturn))
+__attribute ((noreturn, always_inline))
 __do_cancel (void)
 {
   struct pthread *self = THREAD_SELF;