From: Ben Pfaff <blp@nicira.com>
Date: Sat, 19 Jul 2008 23:14:18 +0000 (-0700)
Subject: Fix build on Linux 2.6.26.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b926a8f5e6eea9672d3bc2e08499198357daff83;p=openvswitch

Fix build on Linux 2.6.26.

Linux 2.6.26 requires us to additionally include <linux/rculist.h>
to use RCU lists.
---

diff --git a/datapath/datapath.c b/datapath/datapath.c
index a4c6a2de..147b7aa4 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -28,6 +28,7 @@
 #include <linux/netfilter_bridge.h>
 #include <linux/inetdevice.h>
 #include <linux/list.h>
+#include <linux/rculist.h>
 
 #include "openflow-netlink.h"
 #include "datapath.h"
diff --git a/datapath/hwtable_dummy/hwtable_dummy.c b/datapath/hwtable_dummy/hwtable_dummy.c
index d84dde0c..b6c5832b 100644
--- a/datapath/hwtable_dummy/hwtable_dummy.c
+++ b/datapath/hwtable_dummy/hwtable_dummy.c
@@ -35,6 +35,7 @@
 #include <linux/rcupdate.h>
 #include <linux/slab.h>
 #include <linux/list.h>
+#include <linux/rculist.h>
 #include <linux/delay.h>
 #include <linux/if_arp.h>
 
diff --git a/datapath/linux-2.4/compat-2.4/include/linux/rculist.h b/datapath/linux-2.4/compat-2.4/include/linux/rculist.h
new file mode 100644
index 00000000..c7a69f9c
--- /dev/null
+++ b/datapath/linux-2.4/compat-2.4/include/linux/rculist.h
@@ -0,0 +1,2 @@
+/* In Linux 2.6.26, part of list.h was broken out into rculist.h. */
+#include <linux/list.h>
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/rculist.h b/datapath/linux-2.6/compat-2.6/include/linux/rculist.h
new file mode 100644
index 00000000..4164c0e9
--- /dev/null
+++ b/datapath/linux-2.6/compat-2.6/include/linux/rculist.h
@@ -0,0 +1,12 @@
+#ifndef __LINUX_RCULIST_WRAPPER_H
+#define __LINUX_RCULIST_WRAPPER_H
+
+#include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+#include_next <linux/rculist.h>
+#else
+/* Prior to 2.6.26, the contents of rculist.h were part of list.h. */
+#include <linux/list.h>
+#endif
+
+#endif
diff --git a/datapath/table-linear.c b/datapath/table-linear.c
index 68c3aed1..80948387 100644
--- a/datapath/table-linear.c
+++ b/datapath/table-linear.c
@@ -10,7 +10,7 @@
 
 #include <linux/rcupdate.h>
 #include <linux/slab.h>
-#include <linux/list.h>
+#include <linux/rculist.h>
 
 struct sw_table_linear {
 	struct sw_table swt;