From: Ethan Jackson <ethan@nicira.com>
Date: Wed, 31 Jul 2013 17:49:34 +0000 (-0700)
Subject: compiler: Fix OVS_LOCKS_EXCLUDED on non clang compilers.
X-Git-Tag: sliver-openvswitch-2.0.90-1~34^2~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5624b8ea01f98d2238b6c88c172c760e3c4b4525;p=sliver-openvswitch.git

compiler: Fix OVS_LOCKS_EXCLUDED on non clang compilers.

This patch renames OVS_LOCKS_EXCLUDED to simply OVS_EXCLUDED so it's
more consistent with the other thread safety annotations.  It also
adds it to the non-clang compilers.

Signed-off-by: Ethan Jackson <ethan@nicira.com>
---

diff --git a/lib/compiler.h b/lib/compiler.h
index 1c01fd1d6..94a2218a1 100644
--- a/lib/compiler.h
+++ b/lib/compiler.h
@@ -114,7 +114,7 @@
 #define OVS_GUARDED __attribute__((guarded_var))
 #define OVS_GUARDED_BY(...) __attribute__((guarded_by(__VA_ARGS__)))
 #define OVS_RELEASES(...) __attribute__((unlock_function(__VA_ARGS__)))
-#define OVS_LOCKS_EXCLUDED(...) __attribute__((locks_excluded(__VA_ARGS__)))
+#define OVS_EXCLUDED(...) __attribute__((locks_excluded(__VA_ARGS__)))
 #elif __CHECKER__
 /* "sparse" annotations for mutexes and mutex-like constructs.
  *
@@ -134,6 +134,7 @@
 #define OVS_TRY_LOCK(REVAL, ...)
 #define OVS_GUARDED
 #define OVS_GUARDED_BY(...)
+#define OVS_EXCLUDED(...)
 #define OVS_RELEASES(...)   __attribute__((context(MUTEX, 1, 0)))
 #define OVS_MACRO_LOCK(...) __context__(MUTEX, 0, 1)
 #define OVS_MACRO_RELEASE(...) __context__(MUTEX, 1, 0)
@@ -150,6 +151,7 @@
 #define OVS_TRY_LOCK(...)
 #define OVS_GUARDED
 #define OVS_GUARDED_BY(...)
+#define OVS_EXCLUDED(...)
 #define OVS_RELEASES(...)
 #define OVS_MACRO_LOCK(...)
 #define OVS_MACRO_RELEASE(...)