Apply k4412 kernel from HardKernel for ODROID-X.

1 files changed, 15 insertions, 3 deletions

diff --git a/include/linux/iocontext.h b/include/linux/iocontext.h
index b2eee896dcb..7cbace3e14f 100644
--- a/include/linux/iocontext.h
+++ b/include/linux/iocontext.h
@@ -1,14 +1,14 @@
 #ifndef IOCONTEXT_H
 #define IOCONTEXT_H
 
+#include <linux/bitmap.h>
 #include <linux/radix-tree.h>
 #include <linux/rcupdate.h>
 
-struct cfq_queue;
 struct cfq_io_context {
         void *key;
 
-        struct cfq_queue *cfqq[2];
+        void *cfqq[2];
 
         struct io_context *ioc;
 
@@ -28,6 +28,16 @@ struct cfq_io_context {
 };
 
 /*
+ * Indexes into the ioprio_changed bitmap.  A bit set indicates that
+ * the corresponding I/O scheduler needs to see a ioprio update.
+ */
+enum {
+        IOC_CFQ_IOPRIO_CHANGED,
+        IOC_BFQ_IOPRIO_CHANGED,
+        IOC_IOPRIO_CHANGED_BITS
+};
+
+/*
  * I/O subsystem state of the associated processes.  It is refcounted
  * and kmalloc'ed. These could be shared between processes.
  */
@@ -39,7 +49,7 @@ struct io_context {
         spinlock_t lock;
 
         unsigned short ioprio;
-        unsigned short ioprio_changed;
+        DECLARE_BITMAP(ioprio_changed, IOC_IOPRIO_CHANGED_BITS);
 
 #if defined(CONFIG_BLK_CGROUP) || defined(CONFIG_BLK_CGROUP_MODULE)
         unsigned short cgroup_changed;
@@ -53,6 +63,8 @@ struct io_context {
 
         struct radix_tree_root radix_root;
         struct hlist_head cic_list;
+        struct radix_tree_root bfq_radix_root;
+        struct hlist_head bfq_cic_list;
         void __rcu *ioc_data;
 };