diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
| commit | 47871889c601d8199c51a4086f77eebd77c29b0b (patch) | |
| tree | 40cdcac3bff0ee40cc33dcca61d0577cdf965f77 /include/linux/rtnetlink.h | |
| parent | c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3 (diff) | |
| parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/firmware/iscsi_ibft.c
Diffstat (limited to 'include/linux/rtnetlink.h')
| -rw-r--r-- | include/linux/rtnetlink.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index 9590364fe8b5..d1c7c90e9cd4 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h | |||
| @@ -737,6 +737,9 @@ extern void rtnl_lock(void); | |||
| 737 | extern void rtnl_unlock(void); | 737 | extern void rtnl_unlock(void); |
| 738 | extern int rtnl_trylock(void); | 738 | extern int rtnl_trylock(void); |
| 739 | extern int rtnl_is_locked(void); | 739 | extern int rtnl_is_locked(void); |
| 740 | #ifdef CONFIG_PROVE_LOCKING | ||
| 741 | extern int lockdep_rtnl_is_held(void); | ||
| 742 | #endif /* #ifdef CONFIG_PROVE_LOCKING */ | ||
| 740 | 743 | ||
| 741 | extern void rtnetlink_init(void); | 744 | extern void rtnetlink_init(void); |
| 742 | extern void __rtnl_unlock(void); | 745 | extern void __rtnl_unlock(void); |