11 files changed, 15 insertions, 15 deletions

diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index 0e2b72f2b887..4eaceabd8cea 100644
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -1574,7 +1574,7 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
                 if (timeout && time_after(jiffies, orig_jiffies + timeout))
                         break;
         }
-        current->state = TASK_RUNNING;
+        __set_current_state(TASK_RUNNING);
 #ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT
         printk("lsr = %d (jiff=%lu)...done\n", lsr, jiffies);
 #endif
@@ -1700,7 +1700,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
 #endif
                 schedule();
         }
-        current->state = TASK_RUNNING;
+        __set_current_state(TASK_RUNNING);
         remove_wait_queue(&info->open_wait, &wait);
         if (extra_count)
                 state->count++;
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index 29b5375feeba..ff63ee1d6065 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -2445,7 +2445,7 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
                 base_addr = cinfo->base_addr;
                 firm_id = base_addr + ID_ADDRESS;
                 if (!ISZLOADED(*cinfo)) {
-                        current->state = TASK_RUNNING;
+                        __set_current_state(TASK_RUNNING);
                         remove_wait_queue(&info->open_wait, &wait);
                         return -EINVAL;
                 }
@@ -2498,7 +2498,7 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
                         schedule();
                 }
         }
-        current->state = TASK_RUNNING;
+        __set_current_state(TASK_RUNNING);
         remove_wait_queue(&info->open_wait, &wait);
         if (!tty_hung_up_p(filp)) {
                 info->count++;
diff --git a/drivers/char/epca.c b/drivers/char/epca.c
index de5be30484ad..c6c56fb8ba50 100644
--- a/drivers/char/epca.c
+++ b/drivers/char/epca.c
@@ -949,7 +949,7 @@ static int block_til_ready(struct tty_struct *tty,
 
         } /* End forever while  */
 
-        current->state = TASK_RUNNING;
+        __set_current_state(TASK_RUNNING);
         remove_wait_queue(&ch->open_wait, &wait);
         if (!tty_hung_up_p(filp))
                 ch->count++;
diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
index 23b25ada65ea..49f914e79216 100644
--- a/drivers/char/genrtc.c
+++ b/drivers/char/genrtc.c
@@ -207,7 +207,7 @@ static ssize_t gen_rtc_read(struct file *file, char __user *buf,
                         sizeof(unsigned long);
         }
  out:
-        current->state = TASK_RUNNING;
+        __set_current_state(TASK_RUNNING);
         remove_wait_queue(&gen_rtc_wait, &wait);
 
         return retval;
diff --git a/drivers/char/n_r3964.c b/drivers/char/n_r3964.c
index 65f2d3a96b85..14557a4822c0 100644
--- a/drivers/char/n_r3964.c
+++ b/drivers/char/n_r3964.c
@@ -1088,13 +1088,13 @@ static ssize_t r3964_read(struct tty_struct *tty, struct file *file,
                         /* block until there is a message: */
                         add_wait_queue(&pInfo->read_wait, &wait);
 repeat:
-                        current->state = TASK_INTERRUPTIBLE;
+                        __set_current_state(TASK_INTERRUPTIBLE);
                         pMsg = remove_msg(pInfo, pClient);
                         if (!pMsg && !signal_pending(current)) {
                                 schedule();
                                 goto repeat;
                         }
-                        current->state = TASK_RUNNING;
+                        __set_current_state(TASK_RUNNING);
                         remove_wait_queue(&pInfo->read_wait, &wait);
                 }
 
diff --git a/drivers/char/riscom8.c b/drivers/char/riscom8.c
index 70145254fb9d..3494e3fc44bf 100644
--- a/drivers/char/riscom8.c
+++ b/drivers/char/riscom8.c
@@ -980,7 +980,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
                 }
                 schedule();
         }
-        current->state = TASK_RUNNING;
+        __set_current_state(TASK_RUNNING);
         remove_wait_queue(&port->open_wait, &wait);
         if (!tty_hung_up_p(filp))
                 port->count++;
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index aa4cc12bbcb1..e249d8cfcd06 100644
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -943,7 +943,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
 #endif
                 schedule();     /*  Don't hold spinlock here, will hang PC */
         }
-        current->state = TASK_RUNNING;
+        __set_current_state(TASK_RUNNING);
         remove_wait_queue(&info->open_wait, &wait);
 
         spin_lock_irqsave(&info->slock, flags);
@@ -1598,7 +1598,7 @@ static void rp_wait_until_sent(struct tty_struct *tty, int timeout)
                 if (signal_pending(current))
                         break;
         }
-        current->state = TASK_RUNNING;
+        __set_current_state(TASK_RUNNING);
 #ifdef ROCKET_DEBUG_WAIT_UNTIL_SENT
         printk(KERN_INFO "txcnt = %d (jiff=%lu)...done\n", txcnt, jiffies);
 #endif
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index c7dac9b13351..20380a2c4dee 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -388,7 +388,7 @@ static ssize_t rtc_read(struct file *file, char __user *buf,
         if (!retval)
                 retval = count;
  out:
-        current->state = TASK_RUNNING;
+        __set_current_state(TASK_RUNNING);
         remove_wait_queue(&rtc_wait, &wait);
 
         return retval;
diff --git a/drivers/char/selection.c b/drivers/char/selection.c
index 74cff839c857..a69f094d1ed3 100644
--- a/drivers/char/selection.c
+++ b/drivers/char/selection.c
@@ -299,7 +299,7 @@ int paste_selection(struct tty_struct *tty)
                 pasted += count;
         }
         remove_wait_queue(&vc->paste_wait, &wait);
-        current->state = TASK_RUNNING;
+        __set_current_state(TASK_RUNNING);
 
         tty_ldisc_deref(ld);
         return 0;
diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c
index 5fd314adc1f2..c585b4738f86 100644
--- a/drivers/char/serial167.c
+++ b/drivers/char/serial167.c
@@ -1892,7 +1892,7 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
 #endif
                     schedule();
         }
-        current->state = TASK_RUNNING;
+        __set_current_state(TASK_RUNNING);
         remove_wait_queue(&info->open_wait, &wait);
         if (!tty_hung_up_p(filp)) {
                 info->count++;
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c
index c9f2dd620e87..c6f6f4209739 100644
--- a/drivers/char/vt_ioctl.c
+++ b/drivers/char/vt_ioctl.c
@@ -1061,7 +1061,7 @@ int vt_waitactive(int vt)
                 schedule();
         }
         remove_wait_queue(&vt_activate_queue, &wait);
-        current->state = TASK_RUNNING;
+        __set_current_state(TASK_RUNNING);
         return retval;
 }