Skip to content

L
linux-davinci
Commit 2f49b3e3 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files
Options

Merge branch 'rt/atomic-locks' into rt/base

parents 54181c46 6cffa489
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
include/linux/spinlock_types.h
View file @ 2f49b3e3
...@@ -104,7 +104,8 @@ typedef struct { ...@@ -104,7 +104,8 @@ typedef struct {
*/ */
#define SPIN_LOCK_UNLOCKED __SPIN_LOCK_UNLOCKED(old_style_spin_init) #define SPIN_LOCK_UNLOCKED __SPIN_LOCK_UNLOCKED(old_style_spin_init)
#define DEFINE_SPINLOCK(x) spinlock_t x = __SPIN_LOCK_UNLOCKED(x) #define __DEFINE_SPINLOCK(x) spinlock_t x = __SPIN_LOCK_UNLOCKED(x)
#define DEFINE_SPINLOCK(x) __DEFINE_SPINLOCK(x)
#include <linux/rwlock_types.h> #include <linux/rwlock_types.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment