The following commit has been merged in the master branch: commit 924c0d8f69aabc56b31595553ec5a125832a6c44 Author: Linus Lüssing linus.luessing@ascom.ch Date: Sun Feb 13 21:13:03 2011 +0000
batman-adv: add __rcu annotations for gw_node
Add __rcu annotations for the rcu protected bat_priv->curr_gw pointer to allow sparse checking.
Signed-off-by: Linus Lüssing linus.luessing@ascom.ch
diff --git a/compat.h b/compat.h index a76d0be..4e89049 100644 --- a/compat.h +++ b/compat.h @@ -270,4 +270,10 @@ int bat_seq_printf(struct seq_file *m, const char *f, ...);
#endif /* < KERNEL_VERSION(2, 6, 33) */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) + +#define __rcu + +#endif /* < KERNEL_VERSION(2, 6, 36) */ + #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ diff --git a/types.h b/types.h index 8447330..b6acb12 100644 --- a/types.h +++ b/types.h @@ -170,7 +170,7 @@ struct bat_priv { struct delayed_work hna_work; struct delayed_work orig_work; struct delayed_work vis_work; - struct gw_node *curr_gw; + struct gw_node __rcu *curr_gw; /* rcu protected pointer */ struct vis_info *my_vis_info; };