diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-05-25 02:02:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-05-25 02:02:43 -0400 |
| commit | bd9c67ad9693bacef086d65c1c6744645d4777e7 (patch) | |
| tree | 1dcbac332819a79dbaa1a1a836a8485f866568ad /tools/include | |
| parent | 861410270ab5b13f72fc9afc74fa60f3eb7c2b7e (diff) | |
| parent | b50694381cfc22dce3a60a291cdae294a5e5777c (diff) | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/include')
| -rw-r--r-- | tools/include/linux/spinlock.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/include/linux/spinlock.h b/tools/include/linux/spinlock.h index b21b586b9854..1738c0391da4 100644 --- a/tools/include/linux/spinlock.h +++ b/tools/include/linux/spinlock.h | |||
| @@ -6,8 +6,9 @@ | |||
| 6 | #include <stdbool.h> | 6 | #include <stdbool.h> |
| 7 | 7 | ||
| 8 | #define spinlock_t pthread_mutex_t | 8 | #define spinlock_t pthread_mutex_t |
| 9 | #define DEFINE_SPINLOCK(x) pthread_mutex_t x = PTHREAD_MUTEX_INITIALIZER; | 9 | #define DEFINE_SPINLOCK(x) pthread_mutex_t x = PTHREAD_MUTEX_INITIALIZER |
| 10 | #define __SPIN_LOCK_UNLOCKED(x) (pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER | 10 | #define __SPIN_LOCK_UNLOCKED(x) (pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER |
| 11 | #define spin_lock_init(x) pthread_mutex_init(x, NULL) | ||
| 11 | 12 | ||
| 12 | #define spin_lock_irqsave(x, f) (void)f, pthread_mutex_lock(x) | 13 | #define spin_lock_irqsave(x, f) (void)f, pthread_mutex_lock(x) |
| 13 | #define spin_unlock_irqrestore(x, f) (void)f, pthread_mutex_unlock(x) | 14 | #define spin_unlock_irqrestore(x, f) (void)f, pthread_mutex_unlock(x) |