Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75bcc8c5 authored by Nishanth Aravamudan's avatar Nishanth Aravamudan Committed by Linus Torvalds
Browse files

[PATCH] kernel: fix-up schedule_timeout() usage 



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

Signed-off-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 041e0e3b

kernel/compat.c

+3 −6
Original line number Diff line number Diff line
@@ -48,8 +48,7 @@ static long compat_nanosleep_restart(struct restart_block *restart) 
	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(struct compat_timespec __user *rqtp, 
		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_sigset_t __user *uthese, 
			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);

kernel/signal.c

+1 −2
Original line number Diff line number Diff line
@@ -2221,8 +2221,7 @@ sys_rt_sigtimedwait(const sigset_t __user *uthese, 
			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);

kernel/timer.c

+6 −12
Original line number Diff line number Diff line
@@ -1184,8 +1184,7 @@ static long __sched nanosleep_restart(struct restart_block *restart) 
	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) {
@@ -1213,8 +1212,7 @@ asmlinkage long sys_nanosleep(struct timespec __user *rqtp, struct timespec __us 
		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) {
@@ -1612,10 +1610,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);
@@ -1628,10 +1624,8 @@ unsigned long msleep_interruptible(unsigned int msecs) 
{

	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);

}