1 files changed, 25 insertions, 8 deletions

diff --git a/drivers/mmc/card/queue.h b/drivers/mmc/card/queue.h
index 6223ef8dc9c..d2a1eb4b9f9 100644
--- a/drivers/mmc/card/queue.h
+++ b/drivers/mmc/card/queue.h
@@ -4,19 +4,35 @@
 struct request;
 struct task_struct;
 
+struct mmc_blk_request {
+        struct mmc_request      mrq;
+        struct mmc_command      sbc;
+        struct mmc_command      cmd;
+        struct mmc_command      stop;
+        struct mmc_data         data;
+};
+
+struct mmc_queue_req {
+        struct request          *req;
+        struct mmc_blk_request  brq;
+        struct scatterlist      *sg;
+        char                    *bounce_buf;
+        struct scatterlist      *bounce_sg;
+        unsigned int            bounce_sg_len;
+        struct mmc_async_req    mmc_active;
+};
+
 struct mmc_queue {
         struct mmc_card         *card;
         struct task_struct      *thread;
         struct semaphore        thread_sem;
         unsigned int            flags;
-        struct request          *req;
         int                     (*issue_fn)(struct mmc_queue *, struct request *);
         void                    *data;
         struct request_queue    *queue;
-        struct scatterlist      *sg;
-        char                    *bounce_buf;
-        struct scatterlist      *bounce_sg;
-        unsigned int            bounce_sg_len;
+        struct mmc_queue_req    mqrq[2];
+        struct mmc_queue_req    *mqrq_cur;
+        struct mmc_queue_req    *mqrq_prev;
 };
 
 extern int mmc_init_queue(struct mmc_queue *, struct mmc_card *, spinlock_t *,
@@ -25,8 +41,9 @@ extern void mmc_cleanup_queue(struct mmc_queue *);
 extern void mmc_queue_suspend(struct mmc_queue *);
 extern void mmc_queue_resume(struct mmc_queue *);
 
-extern unsigned int mmc_queue_map_sg(struct mmc_queue *);
-extern void mmc_queue_bounce_pre(struct mmc_queue *);
-extern void mmc_queue_bounce_post(struct mmc_queue *);
+extern unsigned int mmc_queue_map_sg(struct mmc_queue *,
+                                     struct mmc_queue_req *);
+extern void mmc_queue_bounce_pre(struct mmc_queue_req *);
+extern void mmc_queue_bounce_post(struct mmc_queue_req *);
 
 #endif