From b926a8f5e6eea9672d3bc2e08499198357daff83 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@nicira.com>
Date: Sat, 19 Jul 2008 16:14:18 -0700
Subject: [PATCH] Fix build on Linux 2.6.26.

Linux 2.6.26 requires us to additionally include <linux/rculist.h>
to use RCU lists.
---
 datapath/datapath.c                                  |  1 +
 datapath/hwtable_dummy/hwtable_dummy.c               |  1 +
 .../linux-2.4/compat-2.4/include/linux/rculist.h     |  2 ++
 .../linux-2.6/compat-2.6/include/linux/rculist.h     | 12 ++++++++++++
 datapath/table-linear.c                              |  2 +-
 5 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 datapath/linux-2.4/compat-2.4/include/linux/rculist.h
 create mode 100644 datapath/linux-2.6/compat-2.6/include/linux/rculist.h

diff --git a/datapath/datapath.c b/datapath/datapath.c
index a4c6a2de8..147b7aa40 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 d84dde0ca..b6c5832b5 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 000000000..c7a69f9c6
--- /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 000000000..4164c0e99
--- /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 68c3aed11..809483871 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;
-- 
2.43.0