From 07a485defae1ef578c5b3ce0d4373201948a7345 Mon Sep 17 00:00:00 2001 From: "\"Steven J. Hill\"" Date: Tue, 13 Sep 2005 02:28:34 +0000 Subject: Merge with trunk. "So do that funky merge whiiite boy..." --- libpthread/linuxthreads/spinlock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libpthread/linuxthreads/spinlock.h') diff --git a/libpthread/linuxthreads/spinlock.h b/libpthread/linuxthreads/spinlock.h index 0ec40c57c..ff96fc336 100644 --- a/libpthread/linuxthreads/spinlock.h +++ b/libpthread/linuxthreads/spinlock.h @@ -196,7 +196,7 @@ static inline long atomic_decrement(struct pthread_atomic *pa) } -static inline void +static inline __attribute__((always_inline)) void __pthread_set_own_extricate_if (pthread_descr self, pthread_extricate_if *peif) { /* Only store a non-null peif if the thread has cancellation enabled. -- cgit v1.2.3