diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-12-16 05:23:45 -0500 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-12-16 05:23:45 -0500 |
| commit | c4de673b775e4db48cd2db6277e0c6714332ca0c (patch) | |
| tree | 84f9e4728e6ccf257236d2ba063b6e784ec8b65d /include/linux/lglock.h | |
| parent | bafdc614a1f4f8be8cde41b8ab10ac17e67c1837 (diff) | |
| parent | 55957fb7a0b61d8ab6ff3f04e279b8fc22b738fa (diff) | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'include/linux/lglock.h')
| -rw-r--r-- | include/linux/lglock.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/lglock.h b/include/linux/lglock.h index 0d24e932db0b..96549abe8842 100644 --- a/include/linux/lglock.h +++ b/include/linux/lglock.h | |||
| @@ -25,16 +25,6 @@ | |||
| 25 | #include <linux/cpu.h> | 25 | #include <linux/cpu.h> |
| 26 | #include <linux/notifier.h> | 26 | #include <linux/notifier.h> |
| 27 | 27 | ||
| 28 | /* can make br locks by using local lock for read side, global lock for write */ | ||
| 29 | #define br_lock_init(name) lg_lock_init(name, #name) | ||
| 30 | #define br_read_lock(name) lg_local_lock(name) | ||
| 31 | #define br_read_unlock(name) lg_local_unlock(name) | ||
| 32 | #define br_write_lock(name) lg_global_lock(name) | ||
| 33 | #define br_write_unlock(name) lg_global_unlock(name) | ||
| 34 | |||
| 35 | #define DEFINE_BRLOCK(name) DEFINE_LGLOCK(name) | ||
| 36 | #define DEFINE_STATIC_BRLOCK(name) DEFINE_STATIC_LGLOCK(name) | ||
| 37 | |||
| 38 | #ifdef CONFIG_DEBUG_LOCK_ALLOC | 28 | #ifdef CONFIG_DEBUG_LOCK_ALLOC |
| 39 | #define LOCKDEP_INIT_MAP lockdep_init_map | 29 | #define LOCKDEP_INIT_MAP lockdep_init_map |
| 40 | #else | 30 | #else |