Merge branch 'core/rcu' into core/rcu-for-linus

2008-07-15 21:10:12 +02:00
parent b9d2252c1e 199a952876
commit 6c9fcaf2ee
33 changed files with 1347 additions and 530 deletions
--- a/drivers/infiniband/hw/ipath/ipath_verbs.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.c
@ -35,6 +35,7 @@
 #include <rdma/ib_user_verbs.h>
 #include <linux/io.h>
 #include <linux/utsname.h>
+#include <linux/rculist.h>

 #include "ipath_kernel.h"
 #include "ipath_verbs.h"
--- a/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c
@ -31,8 +31,7 @@
 * SOFTWARE.
 */

-#include <linux/list.h>
-#include <linux/rcupdate.h>
+#include <linux/rculist.h>

 #include "ipath_verbs.h"