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

2f49b3e3 · Thomas Gleixner · 54181c46 · 6cffa489 · 2f49b3e3
Commit 2f49b3e3 authored Jul 29, 2009 by Thomas Gleixner
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

include/linux/spinlock_types.h include/linux/spinlock_types.h +2 -1

No files found.
--- a/include/linux/spinlock_types.h
+++ b/include/linux/spinlock_types.h
@@ -104,7 +104,8 @@ typedef struct {
 */
 #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>