git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
[safe/jmp/linux-2.6]
/
include
/
linux
/
rtnetlink.h
diff --git
a/include/linux/rtnetlink.h
b/include/linux/rtnetlink.h
index
9590364
..
d1c7c90
100644
(file)
--- a/
include/linux/rtnetlink.h
+++ b/
include/linux/rtnetlink.h
@@
-737,6
+737,9
@@
extern void rtnl_lock(void);
extern void rtnl_unlock(void);
extern int rtnl_trylock(void);
extern int rtnl_is_locked(void);
extern void rtnl_unlock(void);
extern int rtnl_trylock(void);
extern int rtnl_is_locked(void);
+#ifdef CONFIG_PROVE_LOCKING
+extern int lockdep_rtnl_is_held(void);
+#endif /* #ifdef CONFIG_PROVE_LOCKING */
extern void rtnetlink_init(void);
extern void __rtnl_unlock(void);
extern void rtnetlink_init(void);
extern void __rtnl_unlock(void);