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 /net/core/rtnetlink.c | |
| 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 'net/core/rtnetlink.c')
| -rw-r--r-- | net/core/rtnetlink.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index d1472a423323..4568120d8533 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c | |||
| @@ -90,6 +90,14 @@ int rtnl_is_locked(void) | |||
| 90 | } | 90 | } |
| 91 | EXPORT_SYMBOL(rtnl_is_locked); | 91 | EXPORT_SYMBOL(rtnl_is_locked); |
| 92 | 92 | ||
| 93 | #ifdef CONFIG_PROVE_LOCKING | ||
| 94 | int lockdep_rtnl_is_held(void) | ||
| 95 | { | ||
| 96 | return lockdep_is_held(&rtnl_mutex); | ||
| 97 | } | ||
| 98 | EXPORT_SYMBOL(lockdep_rtnl_is_held); | ||
| 99 | #endif /* #ifdef CONFIG_PROVE_LOCKING */ | ||
| 100 | |||
| 93 | static struct rtnl_link *rtnl_msg_handlers[NPROTO]; | 101 | static struct rtnl_link *rtnl_msg_handlers[NPROTO]; |
| 94 | 102 | ||
| 95 | static inline int rtm_msgindex(int msgtype) | 103 | static inline int rtm_msgindex(int msgtype) |