2012-02-15 21:46:46

by John W. Linville

Subject: [PATCH] compat: add dummy lockdep_rtnl_is_held implementation

Obviously, this is wrong. But the base kernel will have rtnl_mutex
declared static, with no way to access it. I think this is the best
we can do...

Signed-off-by: John W. Linville <[email protected]>
---
include/linux/compat-2.6.34.h | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/include/linux/compat-2.6.34.h b/include/linux/compat-2.6.34.h
index a9c9dd1..da242ce 100644
--- a/include/linux/compat-2.6.34.h
+++ b/include/linux/compat-2.6.34.h
@@ -292,6 +292,18 @@ static inline int rcu_read_lock_held(void)
return 1;
}

+#ifdef CONFIG_PROVE_LOCKING
+/*
+ * Obviously, this is wrong. But the base kernel will have rtnl_mutex
+ * declared static, with no way to access it. I think this is the best
+ * we can do...
+ */
+static inline int lockdep_rtnl_is_held(void)
+{
+ return 1;
+}
+#endif /* #ifdef CONFIG_PROVE_LOCKING */
+
#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34)) */

#endif /* LINUX_26_34_COMPAT_H */
--
1.7.4.4

2012-02-16 19:54:58

by Luis R. Rodriguez

Subject: Re: [PATCH] compat: add dummy lockdep_rtnl_is_held implementation

On Wed, Feb 15, 2012 at 1:36 PM, John W. Linville
<[email protected]> wrote:
> Obviously, this is wrong.  But the base kernel will have rtnl_mutex
> declared static, with no way to access it.  I think this is the best
> we can do...
>
> Signed-off-by: John W. Linville <[email protected]>
> ---

Applied and pushed, thanks!

Luis