5 files changed, 7 insertions, 7 deletions

diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 2568640430fb..b3f639fbf220 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -770,7 +770,7 @@ static void DAC960_P_QueueCommand(DAC960_Command_T *Command)
 static void DAC960_ExecuteCommand(DAC960_Command_T *Command)
 {
   DAC960_Controller_T *Controller = Command->Controller;
-  DECLARE_COMPLETION(Completion);
+  DECLARE_COMPLETION_ONSTACK(Completion);
   unsigned long flags;
   Command->Completion = &Completion;
 
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index d2d45eaf3681..99f87efe0f58 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -879,7 +879,7 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
                         char *buff = NULL;
                         u64bit temp64;
                         unsigned long flags;
-                        DECLARE_COMPLETION(wait);
+                        DECLARE_COMPLETION_ONSTACK(wait);
 
                         if (!arg)
                                 return -EINVAL;
@@ -997,7 +997,7 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
                         BYTE sg_used = 0;
                         int status = 0;
                         int i;
-                        DECLARE_COMPLETION(wait);
+                        DECLARE_COMPLETION_ONSTACK(wait);
                         __u32 left;
                         __u32 sz;
                         BYTE __user *data_ptr;
@@ -1816,7 +1816,7 @@ static int sendcmd_withirq(__u8 cmd,
         u64bit buff_dma_handle;
         unsigned long flags;
         int return_status;
-        DECLARE_COMPLETION(wait);
+        DECLARE_COMPLETION_ONSTACK(wait);
 
         if ((c = cmd_alloc(h, 0)) == NULL)
                 return -ENOMEM;
diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c
index 05f79d7393f7..bb15051ffbe0 100644
--- a/drivers/block/cciss_scsi.c
+++ b/drivers/block/cciss_scsi.c
@@ -766,7 +766,7 @@ cciss_scsi_do_simple_cmd(ctlr_info_t *c,
                         int direction)
 {
         unsigned long flags;
-        DECLARE_COMPLETION(wait);
+        DECLARE_COMPLETION_ONSTACK(wait);
 
         cp->cmd_type = CMD_IOCTL_PEND;          // treat this like an ioctl 
         cp->scsi_cmd = NULL;
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index 38578b9dbfd1..40a11e567970 100644
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -713,7 +713,7 @@ static void do_pd_request(request_queue_t * q)
 static int pd_special_command(struct pd_unit *disk,
                       enum action (*func)(struct pd_unit *disk))
 {
-        DECLARE_COMPLETION(wait);
+        DECLARE_COMPLETION_ONSTACK(wait);
         struct request rq;
         int err = 0;
 
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 888d1aceeeff..a6b2aa67c9b2 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -348,7 +348,7 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command *
         char sense[SCSI_SENSE_BUFFERSIZE];
         request_queue_t *q;
         struct request *rq;
-        DECLARE_COMPLETION(wait);
+        DECLARE_COMPLETION_ONSTACK(wait);
         int err = 0;
 
         q = bdev_get_queue(pd->bdev);