[PATCH] schedule_timeout_[un]interruptible() speedup

These functions don't need schedule_timeout()'s barrier. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] schedule_timeout_[un]interruptible() speedup
These functions don't need schedule_timeout()'s barrier. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Andrew Morton · Linus Torvalds
1 parent 498d0c5711
Showing 1 changed file with 6 additions and 3 deletions Side-by-side Diff
kernel/timer.c
@@ -1151,19 +1151,22 @@
  out:
 	return timeout < 0 ? 0 : timeout;
 }
-
 EXPORT_SYMBOL(schedule_timeout);
  
+/*
+ * We can use __set_current_state() here because schedule_timeout() calls
+ * schedule() unconditionally.
+ */
 signed long __sched schedule_timeout_interruptible(signed long timeout)
 {
-       set_current_state(TASK_INTERRUPTIBLE);
+       __set_current_state(TASK_INTERRUPTIBLE);
        return schedule_timeout(timeout);
 }
 EXPORT_SYMBOL(schedule_timeout_interruptible);
  
 signed long __sched schedule_timeout_uninterruptible(signed long timeout)
 {
-       set_current_state(TASK_UNINTERRUPTIBLE);
+       __set_current_state(TASK_UNINTERRUPTIBLE);
        return schedule_timeout(timeout);
 }
 EXPORT_SYMBOL(schedule_timeout_uninterruptible);
...	...	@@ -1151,19 +1151,22 @@
1151	1151	out:
1152	1152	return timeout < 0 ? 0 : timeout;
1153	1153	}
1154		-
1155	1154	EXPORT_SYMBOL(schedule_timeout);
1156	1155
	1156	+/*
	1157	+ * We can use __set_current_state() here because schedule_timeout() calls
	1158	+ * schedule() unconditionally.
	1159	+ */
1157	1160	signed long __sched schedule_timeout_interruptible(signed long timeout)
1158	1161	{
1159		- set_current_state(TASK_INTERRUPTIBLE);
	1162	+ __set_current_state(TASK_INTERRUPTIBLE);
1160	1163	return schedule_timeout(timeout);
1161	1164	}
1162	1165	EXPORT_SYMBOL(schedule_timeout_interruptible);
1163	1166
1164	1167	signed long __sched schedule_timeout_uninterruptible(signed long timeout)
1165	1168	{
1166		- set_current_state(TASK_UNINTERRUPTIBLE);
	1169	+ __set_current_state(TASK_UNINTERRUPTIBLE);
1167	1170	return schedule_timeout(timeout);
1168	1171	}
1169	1172	EXPORT_SYMBOL(schedule_timeout_uninterruptible);