Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[safe/jmp/linux-2.6] / include / linux / iocontext.h

diff --git a/include/linux/iocontext.h b/include/linux/iocontext.h
index 78ef023..a0bb301 100644 (file)
--- a/include/linux/iocontext.h
+++ b/include/linux/iocontext.h
@@ -42,15 +42,15 @@ struct io_context {
        unsigned short ioprio;
        unsigned short ioprio_changed;
 
-#ifdef CONFIG_BLK_CGROUP
+#if defined(CONFIG_BLK_CGROUP) || defined(CONFIG_BLK_CGROUP_MODULE)
        unsigned short cgroup_changed;
 #endif
 
        /*
         * For request batching
         */
-       unsigned long last_waited; /* Time last woken after wait for request */
        int nr_batch_requests;     /* Number of requests left in the batch */
+       unsigned long last_waited; /* Time last woken after wait for request */
 
        struct radix_tree_root radix_root;
        struct hlist_head cic_list;