Merge branch 'omap2-upstream' into devel

1 files changed, 3 insertions, 0 deletions

diff --git a/include/linux/iocontext.h b/include/linux/iocontext.h
index 1b4ccf25b4d2..cac4b364cd40 100644
--- a/include/linux/iocontext.h
+++ b/include/linux/iocontext.h
@@ -2,6 +2,7 @@
 #define IOCONTEXT_H
 
 #include <linux/radix-tree.h>
+#include <linux/rcupdate.h>
 
 /*
  * This is the per-process anticipatory I/O scheduler state.
@@ -54,6 +55,8 @@ struct cfq_io_context {
 
         void (*dtor)(struct io_context *); /* destructor */
         void (*exit)(struct io_context *); /* called on task exit */
+
+        struct rcu_head rcu_head;
 };
 
 /*