From: Ben Pfaff Date: Fri, 21 Feb 2014 18:50:56 +0000 (-0800) Subject: ovs-thread: Get rid of obsolete sparse wrappers. X-Git-Tag: sliver-openvswitch-2.1.90-1~1^2~14 X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=ece7040fe4c4b02c279afbb6dfc9d05687908000 ovs-thread: Get rid of obsolete sparse wrappers. These were useful back when we were trying to use the sparse lock balance annotations, but we removed those in commit 47b52c71232c0 (sparse: Remove support for thread-safety annotations.) and so they serve no purpose any longer. Signed-off-by: Ben Pfaff Acked-by: Joe Stringer --- diff --git a/lib/ovs-thread.h b/lib/ovs-thread.h index 5c1e83903..955560638 100644 --- a/lib/ovs-thread.h +++ b/lib/ovs-thread.h @@ -123,17 +123,6 @@ void xpthread_cond_destroy(pthread_cond_t *); void xpthread_cond_signal(pthread_cond_t *); void xpthread_cond_broadcast(pthread_cond_t *); -#ifdef __CHECKER__ -/* Replace these functions by the macros already defined in the - * annotations, because the macro definitions have correct semantics for the - * conditional acquisition that can't be captured in a function annotation. - * The difference in semantics from pthread_*() to xpthread_*() does not matter - * because sparse is not a compiler. */ -#define xpthread_mutex_trylock pthread_mutex_trylock -#define xpthread_rwlock_tryrdlock pthread_rwlock_tryrdlock -#define xpthread_rwlock_trywrlock pthread_rwlock_trywrlock -#endif - void xpthread_key_create(pthread_key_t *, void (*destructor)(void *)); void xpthread_key_delete(pthread_key_t); void xpthread_setspecific(pthread_key_t, const void *);