diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-18 21:24:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-18 21:24:26 -0700 |
| commit | 73fcb1a370c76b202d406e95d9dabb76eaccf484 (patch) | |
| tree | 78997fee9c78677955d414a699ce965fb8a21065 /tools/include/linux | |
| parent | 10a2f87485b9fb7bec1a50305d4a3ec74aa8058c (diff) | |
| parent | 66072c29328717072fd84aaff3e070e3f008ba77 (diff) | |
| download | cachepc-linux-73fcb1a370c76b202d406e95d9dabb76eaccf484.tar.gz cachepc-linux-73fcb1a370c76b202d406e95d9dabb76eaccf484.zip | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"10 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
hfsplus: stop workqueue when fill_super() failed
mm: don't allow deferred pages with NEED_PER_CPU_KM
MAINTAINERS: add Q: entry to kselftest for patchwork project
radix tree: fix multi-order iteration race
radix tree test suite: multi-order iteration race
radix tree test suite: add item_delete_rcu()
radix tree test suite: fix compilation issue
radix tree test suite: fix mapshift build target
include/linux/mm.h: add new inline function vmf_error()
lib/test_bitmap.c: fix bitmap optimisation tests to report errors correctly
Diffstat (limited to 'tools/include/linux')
| -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 @@ #include <stdbool.h> #define spinlock_t pthread_mutex_t -#define DEFINE_SPINLOCK(x) pthread_mutex_t x = PTHREAD_MUTEX_INITIALIZER; +#define DEFINE_SPINLOCK(x) pthread_mutex_t x = PTHREAD_MUTEX_INITIALIZER #define __SPIN_LOCK_UNLOCKED(x) (pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER +#define spin_lock_init(x) pthread_mutex_init(x, NULL) #define spin_lock_irqsave(x, f) (void)f, pthread_mutex_lock(x) #define spin_unlock_irqrestore(x, f) (void)f, pthread_mutex_unlock(x) |