24 files changed, 31 insertions, 31 deletions

diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index eca248d9eba4..3e14b1348c0b 100644
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -295,7 +295,7 @@ ecard_task(void * unused)
  */
 static void ecard_call(struct ecard_request *req)
 {
-        DECLARE_COMPLETION(completion);
+        DECLARE_COMPLETION_ONSTACK(completion);
 
         req->complete = &completion;
 
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index 82b26d5ce476..0831f709f777 100644
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -1061,7 +1061,7 @@ static void __cpuinit do_warm_boot_cpu(void *p)
 
 static int __cpuinit __smp_prepare_cpu(int cpu)
 {
-        DECLARE_COMPLETION(done);
+        DECLARE_COMPLETION_ONSTACK(done);
         struct warm_boot_cpu_info info;
         struct work_struct task;
         int     apicid, ret;
diff --git a/arch/powerpc/platforms/powermac/cpufreq_64.c b/arch/powerpc/platforms/powermac/cpufreq_64.c
index d30466d74194..9d22361a26d6 100644
--- a/arch/powerpc/platforms/powermac/cpufreq_64.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_64.c
@@ -104,7 +104,7 @@ static void g5_smu_switch_volt(int speed_mode)
 {
         struct smu_simple_cmd   cmd;
 
-        DECLARE_COMPLETION(comp);
+        DECLARE_COMPLETION_ONSTACK(comp);
         smu_queue_simple(&cmd, SMU_CMD_POWER_COMMAND, 8, smu_done_complete,
                          &comp, 'V', 'S', 'L', 'E', 'W',
                          0xff, g5_fvt_cur+1, speed_mode);
diff --git a/arch/powerpc/platforms/powermac/nvram.c b/arch/powerpc/platforms/powermac/nvram.c
index 6a36ea9bf673..692945c14919 100644
--- a/arch/powerpc/platforms/powermac/nvram.c
+++ b/arch/powerpc/platforms/powermac/nvram.c
@@ -195,7 +195,7 @@ static void pmu_nvram_complete(struct adb_request *req)
 static unsigned char pmu_nvram_read_byte(int addr)
 {
         struct adb_request req;
-        DECLARE_COMPLETION(req_complete); 
+        DECLARE_COMPLETION_ONSTACK(req_complete);
         
         req.arg = system_state == SYSTEM_RUNNING ? &req_complete : NULL;
         if (pmu_request(&req, pmu_nvram_complete, 3, PMU_READ_NVRAM,
@@ -211,7 +211,7 @@ static unsigned char pmu_nvram_read_byte(int addr)
 static void pmu_nvram_write_byte(int addr, unsigned char val)
 {
         struct adb_request req;
-        DECLARE_COMPLETION(req_complete); 
+        DECLARE_COMPLETION_ONSTACK(req_complete);
         
         req.arg = system_state == SYSTEM_RUNNING ? &req_complete : NULL;
         if (pmu_request(&req, pmu_nvram_complete, 4, PMU_WRITE_NVRAM,
diff --git a/block/as-iosched.c b/block/as-iosched.c
index 165509e8659e..50b95e4c1425 100644
--- a/block/as-iosched.c
+++ b/block/as-iosched.c
@@ -1479,7 +1479,7 @@ static int __init as_init(void)
 
 static void __exit as_exit(void)
 {
-        DECLARE_COMPLETION(all_gone);
+        DECLARE_COMPLETION_ONSTACK(all_gone);
         elv_unregister(&iosched_as);
         ioc_gone = &all_gone;
         /* ioc_gone's update must be visible before reading ioc_count */
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 99116e2a310a..d3d76136f53a 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -2160,7 +2160,7 @@ static int __init cfq_init(void)
 
 static void __exit cfq_exit(void)
 {
-        DECLARE_COMPLETION(all_gone);
+        DECLARE_COMPLETION_ONSTACK(all_gone);
         elv_unregister(&iosched_cfq);
         ioc_gone = &all_gone;
         /* ioc_gone's update must be visible before reading ioc_count */
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);
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 2ebc3760f261..e2f4bb549063 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -2764,7 +2764,7 @@ static void idetape_add_stage_tail (ide_drive_t *drive,idetape_stage_t *stage)
  */
 static void idetape_wait_for_request (ide_drive_t *drive, struct request *rq)
 {
-        DECLARE_COMPLETION(wait);
+        DECLARE_COMPLETION_ONSTACK(wait);
         idetape_tape_t *tape = drive->driver_data;
 
 #if IDETAPE_DEBUG_BUGS
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index 090e40fc5013..c0f9d82e4662 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -870,7 +870,7 @@ int smu_queue_i2c(struct smu_i2c_cmd *cmd)
 
 static int smu_read_datablock(u8 *dest, unsigned int addr, unsigned int len)
 {
-        DECLARE_COMPLETION(comp);
+        DECLARE_COMPLETION_ONSTACK(comp);
         unsigned int chunk;
         struct smu_cmd cmd;
         int rc;
@@ -917,7 +917,7 @@ static int smu_read_datablock(u8 *dest, unsigned int addr, unsigned int len)
 
 static struct smu_sdbp_header *smu_create_sdb_partition(int id)
 {
-        DECLARE_COMPLETION(comp);
+        DECLARE_COMPLETION_ONSTACK(comp);
         struct smu_simple_cmd cmd;
         unsigned int addr, len, tlen;
         struct smu_sdbp_header *hdr;
diff --git a/drivers/macintosh/windfarm_smu_controls.c b/drivers/macintosh/windfarm_smu_controls.c
index bff1f372f188..31b750d61206 100644
--- a/drivers/macintosh/windfarm_smu_controls.c
+++ b/drivers/macintosh/windfarm_smu_controls.c
@@ -56,7 +56,7 @@ static int smu_set_fan(int pwm, u8 id, u16 value)
 {
         struct smu_cmd cmd;
         u8 buffer[16];
-        DECLARE_COMPLETION(comp);
+        DECLARE_COMPLETION_ONSTACK(comp);
         int rc;
 
         /* Fill SMU command structure */
diff --git a/drivers/macintosh/windfarm_smu_sensors.c b/drivers/macintosh/windfarm_smu_sensors.c
index defe9922ebd1..01b4c50143dd 100644
--- a/drivers/macintosh/windfarm_smu_sensors.c
+++ b/drivers/macintosh/windfarm_smu_sensors.c
@@ -67,7 +67,7 @@ static void smu_ads_release(struct wf_sensor *sr)
 static int smu_read_adc(u8 id, s32 *value)
 {
         struct smu_simple_cmd   cmd;
-        DECLARE_COMPLETION(comp);
+        DECLARE_COMPLETION_ONSTACK(comp);
         int rc;
 
         rc = smu_queue_simple(&cmd, SMU_CMD_READ_ADC, 1,
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 7cafa34e4c7f..4d2bc7981324 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -301,7 +301,7 @@ zfcp_scsi_command_sync(struct zfcp_unit *unit, struct scsi_cmnd *scpnt,
                        int use_timer)
 {
         int ret;
-        DECLARE_COMPLETION(wait);
+        DECLARE_COMPLETION_ONSTACK(wait);
 
         scpnt->SCp.ptr = (void *) &wait;  /* silent re-use */
         scpnt->scsi_done = zfcp_scsi_command_sync_handler;
diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c
index 657a3ab75399..15ce40a7053a 100644
--- a/drivers/scsi/53c700.c
+++ b/drivers/scsi/53c700.c
@@ -1939,7 +1939,7 @@ NCR_700_abort(struct scsi_cmnd * SCp)
 STATIC int
 NCR_700_bus_reset(struct scsi_cmnd * SCp)
 {
-        DECLARE_COMPLETION(complete);
+        DECLARE_COMPLETION_ONSTACK(complete);
         struct NCR_700_Host_Parameters *hostdata = 
                 (struct NCR_700_Host_Parameters *)SCp->device->host->hostdata[0];
 
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index c7eeaced324a..1faa008b5b81 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -646,7 +646,7 @@ ahd_linux_dev_reset(struct scsi_cmnd *cmd)
         struct  ahd_initiator_tinfo *tinfo;
         struct  ahd_tmode_tstate *tstate;
         unsigned long flags;
-        DECLARE_COMPLETION(done);
+        DECLARE_COMPLETION_ONSTACK(done);
 
         reset_scb = NULL;
         paused = FALSE;
@@ -2251,7 +2251,7 @@ done:
         if (paused)
                 ahd_unpause(ahd);
         if (wait) {
-                DECLARE_COMPLETION(done);
+                DECLARE_COMPLETION_ONSTACK(done);
 
                 ahd->platform_data->eh_done = &done;
                 ahd_unlock(ahd, &flags);
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 64c8b88a429f..339b85cb61cd 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -2335,7 +2335,7 @@ done:
         if (paused)
                 ahc_unpause(ahc);
         if (wait) {
-                DECLARE_COMPLETION(done);
+                DECLARE_COMPLETION_ONSTACK(done);
 
                 ahc->platform_data->eh_done = &done;
                 ahc_unlock(ahc, &flags);
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index 43afd476e606..0f3eb22b979a 100644
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -724,7 +724,7 @@ int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd,
                    int timeout, u32 *info)
 {
     Scsi_Cmnd *scp;
-    DECLARE_COMPLETION(wait);
+    DECLARE_COMPLETION_ONSTACK(wait);
     int rval;
 
     scp = kmalloc(sizeof(*scp), GFP_KERNEL);
@@ -764,7 +764,7 @@ int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd,
 {
     Scsi_Cmnd *scp = scsi_allocate_device(sdev, 1, FALSE);
     unsigned bufflen = gdtcmd ? sizeof(gdth_cmd_str) : 0;
-    DECLARE_COMPLETION(wait);
+    DECLARE_COMPLETION_ONSTACK(wait);
     int rval;
 
     if (!scp)
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 8953991462d7..332151e2a018 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -813,7 +813,7 @@ qla1280_error_action(struct scsi_cmnd *cmd, enum action action)
         uint16_t data;
         unsigned char *handle;
         int result, i;
-        DECLARE_COMPLETION(wait);
+        DECLARE_COMPLETION_ONSTACK(wait);
         struct timer_list timer;
 
         ha = (struct scsi_qla_host *)(CMD_HOST(cmd)->hostdata);
@@ -2406,7 +2406,7 @@ qla1280_mailbox_command(struct scsi_qla_host *ha, uint8_t mr, uint16_t *mb)
         uint16_t *optr, *iptr;
         uint16_t __iomem *mptr;
         uint16_t data;
-        DECLARE_COMPLETION(wait);
+        DECLARE_COMPLETION_ONSTACK(wait);
         struct timer_list timer;
 
         ENTER("qla1280_mailbox_command");
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index 4655522a08d9..4a000d846a93 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -342,7 +342,7 @@ fail:
 static ssize_t
 ep_io (struct ep_data *epdata, void *buf, unsigned len)
 {
-        DECLARE_COMPLETION (done);
+        DECLARE_COMPLETION_ONSTACK (done);
         int value;
 
         spin_lock_irq (&epdata->dev->lock);
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 0a64504c2545..8c18df869833 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -2869,7 +2869,7 @@ cleanup0:
 
 static int __exit omap_udc_remove(struct platform_device *pdev)
 {
-        DECLARE_COMPLETION(done);
+        DECLARE_COMPLETION_ONSTACK(done);
 
         if (!udc)
                 return -ENODEV;
diff --git a/net/ipv4/ipvs/ip_vs_sync.c b/net/ipv4/ipvs/ip_vs_sync.c
index 6ab57d72b615..91a075edd68e 100644
--- a/net/ipv4/ipvs/ip_vs_sync.c
+++ b/net/ipv4/ipvs/ip_vs_sync.c
@@ -836,7 +836,7 @@ static int fork_sync_thread(void *startup)
 
 int start_sync_thread(int state, char *mcast_ifn, __u8 syncid)
 {
-        DECLARE_COMPLETION(startup);
+        DECLARE_COMPLETION_ONSTACK(startup);
         pid_t pid;
 
         if ((state == IP_VS_STATE_MASTER && sync_master_pid) ||