diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-11-18 09:32:36 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-11-18 09:32:44 +0100 |
| commit | 760a52e80fdf018a9f83a499427923e18e3bd582 (patch) | |
| tree | b37743abb28d9109ce6278b8a896712e713bb25a /include/linux/lockdep.h | |
| parent | 0395442ad25853f50d515f4dc00e3475b0df920d (diff) | |
| parent | 47b6308b643302e642ca2a5cb6470926f7e1c428 (diff) | |
| download | lwn-760a52e80fdf018a9f83a499427923e18e3bd582.tar.gz lwn-760a52e80fdf018a9f83a499427923e18e3bd582.zip | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
This brings in some mwifiex changes that further patches will
need to work on top to not cause merge conflicts.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/linux/lockdep.h')
| -rw-r--r-- | include/linux/lockdep.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h index 64c7425afbce..74ab23176e9b 100644 --- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h @@ -4,7 +4,7 @@ * Copyright (C) 2006,2007 Red Hat, Inc., Ingo Molnar <mingo@redhat.com> * Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com> * - * see Documentation/lockdep-design.txt for more details. + * see Documentation/locking/lockdep-design.txt for more details. */ #ifndef __LINUX_LOCKDEP_H #define __LINUX_LOCKDEP_H @@ -510,6 +510,7 @@ static inline void print_irqtrace_events(struct task_struct *curr) #define lock_map_acquire(l) lock_acquire_exclusive(l, 0, 0, NULL, _THIS_IP_) #define lock_map_acquire_read(l) lock_acquire_shared_recursive(l, 0, 0, NULL, _THIS_IP_) +#define lock_map_acquire_tryread(l) lock_acquire_shared_recursive(l, 0, 1, NULL, _THIS_IP_) #define lock_map_release(l) lock_release(l, 1, _THIS_IP_) #ifdef CONFIG_PROVE_LOCKING |