[-mm PATCH 3/32] kernel: fix-up schedule_timeout() usage

Nishanth Aravamudan
2005-08-15T18:09:09Z

Description: Use schedule_timeout_{,un}interruptible() instead of
set_current_state()/schedule_timeout() to reduce kernel size.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>

---

kernel/compat.c | 9 +++------
kernel/signal.c | 3 +--
kernel/timer.c | 18 ++++++------------
3 files changed, 10 insertions(+), 20 deletions(-)

diff -urpN 2.6.13-rc5-mm1/kernel/compat.c 2.6.13-rc5-mm1-dev/kernel/compat.c
--- 2.6.13-rc5-mm1/kernel/compat.c 2005-08-07 09:57:38.000000000 -0700
+++ 2.6.13-rc5-mm1-dev/kernel/compat.c 2005-08-10 15:21:46.000000000 -0700
@@ -48,8 +48,7 @@ static long compat_nanosleep_restart(str
if (!time_after(expire, now))
return 0;

- current->state = TASK_INTERRUPTIBLE;
- expire = schedule_timeout(expire - now);
+ expire = schedule_timeout_interruptible(expire - now);
if (expire == 0)
return 0;

@@ -82,8 +81,7 @@ asmlinkage long compat_sys_nanosleep(str
return -EINVAL;

expire = timespec_to_jiffies(&t) + (t.tv_sec || t.tv_nsec);
- current->state = TASK_INTERRUPTIBLE;
- expire = schedule_timeout(expire);
+ expire = schedule_timeout_interruptible(expire);
if (expire == 0)
return 0;

@@ -795,8 +793,7 @@ compat_sys_rt_sigtimedwait (compat_sigse
recalc_sigpending();
spin_unlock_irq(&current->sighand->siglock);

- current->state = TASK_INTERRUPTIBLE;
- timeout = schedule_timeout(timeout);
+ timeout = schedule_timeout_interruptible(timeout);

spin_lock_irq(&current->sighand->siglock);
sig = dequeue_signal(current, &s, &info);
diff -urpN 2.6.13-rc5-mm1/kernel/signal.c 2.6.13-rc5-mm1-dev/kernel/signal.c
--- 2.6.13-rc5-mm1/kernel/signal.c 2005-08-07 09:58:16.000000000 -0700
+++ 2.6.13-rc5-mm1-dev/kernel/signal.c 2005-08-10 15:22:29.000000000 -0700
@@ -2228,8 +2228,7 @@ sys_rt_sigtimedwait(const sigset_t __use
recalc_sigpending();
spin_unlock_irq(&current->sighand->siglock);

- current->state = TASK_INTERRUPTIBLE;
- timeout = schedule_timeout(timeout);
+ timeout = schedule_timeout_interruptible(timeout);

try_to_freeze();
spin_lock_irq(&current->sighand->siglock);
diff -urpN 2.6.13-rc5-mm1/kernel/timer.c 2.6.13-rc5-mm1-dev/kernel/timer.c
--- 2.6.13-rc5-mm1/kernel/timer.c 2005-08-07 10:05:22.000000000 -0700
+++ 2.6.13-rc5-mm1-dev/kernel/timer.c 2005-08-10 15:23:18.000000000 -0700
@@ -1199,8 +1199,7 @@ static long __sched nanosleep_restart(st
if (!time_after(expire, now))
return 0;

- current->state = TASK_INTERRUPTIBLE;
- expire = schedule_timeout(expire - now);
+ expire = schedule_timeout_interruptible(expire - now);

ret = 0;
if (expire) {
@@ -1228,8 +1227,7 @@ asmlinkage long sys_nanosleep(struct tim
return -EINVAL;

expire = timespec_to_jiffies(&t) + (t.tv_sec || t.tv_nsec);
- current->state = TASK_INTERRUPTIBLE;
- expire = schedule_timeout(expire);
+ expire = schedule_timeout_interruptible(expire);

ret = 0;
if (expire) {
@@ -1627,10 +1625,8 @@ void msleep(unsigned int msecs)
{
unsigned long timeout = msecs_to_jiffies(msecs) + 1;

- while (timeout) {
- set_current_state(TASK_UNINTERRUPTIBLE);
- timeout = schedule_timeout(timeout);
- }
+ while (timeout)
+ timeout = schedule_timeout_uninterruptible(timeout);
}

EXPORT_SYMBOL(msleep);
@@ -1643,10 +1639,8 @@ unsigned long msleep_interruptible(unsig
{
unsigned long timeout = msecs_to_jiffies(msecs) + 1;

- while (timeout && !signal_pending(current)) {
- set_current_state(TASK_INTERRUPTIBLE);
- timeout = schedule_timeout(timeout);
- }
+ while (timeout && !signal_pending(current))
+ timeout = schedule_timeout_interruptible(timeout);
return jiffies_to_msecs(timeout);
}