Skip to contentSkip to conversation

sched: remove sleep_on() and friends

PATCH In review Arnd Bergmann 2 participants 2 messages Apr 7, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sched: remove sleep_on() and friends

This is the final piece in the puzzle, as all patches to remove the last users of \(interruptible_\|\)sleep_on\(_timeout\|\) have made it into the 3.15 merge window. The work was long overdue, and this interface in particular should not have survived the BKL removal that was done a couple of years ago.

Citing Jon Corbet from http://lwn.net/2001/0201/kernel.php3":
"[...] it was suggested that the janitors look for and fix all code
that calls sleep_on() [...] since (1) almost all such code is incorrect, and (2) Linus has agreed that those functions should be removed in the 2.5 development series".

We haven't quite made it for 2.5, but maybe we can merge this for 3.15.

Cc Peter Zijlstra <[email protected]>
Cc Ingo Molnar <[email protected]>
---
 Documentation/DocBook/kernel-hacking.tmpl | 10 ----------
 include/linux/wait.h                      | 11 -----------
 kernel/sched/core.c                       | 46 ----------------------------------------------
 3 files changed, 67 deletions(-)
Documentation/DocBook/kernel-hacking.tmpl +0 -10
index d0758b24..bd9015d 100644
@@ -850,16 +850,6 @@ printk(KERN_INFO "my ip: %pI4\n", &amp;ipaddress);
     <returnvalue>-ERESTARTSYS</returnvalue> if a signal is received.
     The <function>wait_event()</function> version ignores signals.
    </para>
-   <para>
-   Do not use the <function>sleep_on()</function> function family -
-   it is very easy to accidentally introduce races; almost certainly
-   one of the <function>wait_event()</function> family will do, or a
-   loop around <function>schedule_timeout()</function>. If you choose
-   to loop around <function>schedule_timeout()</function> remember
-   you must set the task state (with 
-   <function>set_current_state()</function>) on each iteration to avoid
-   busy-looping.
-   </para>
  
   </sect1>
 
include/linux/wait.h +0 -11
index 559044c..e7d9d9e 100644
@@ -803,17 +803,6 @@ do {									\
 	__ret;								\
 })
 
-
-/*
- * These are the old interfaces to sleep waiting for an event.
- * They are racy.  DO NOT use them, use the wait_event* interfaces above.
- * We plan to remove these interfaces.
- */
-extern void sleep_on(wait_queue_head_t *q);
-extern long sleep_on_timeout(wait_queue_head_t *q, signed long timeout);
-extern void interruptible_sleep_on(wait_queue_head_t *q);
-extern long interruptible_sleep_on_timeout(wait_queue_head_t *q, signed long timeout);
-
 /*
  * Waitqueues which are removed from the waitqueue_head at wakeup time
  */
kernel/sched/core.c +0 -46

52 lines not on this page · raw message

#1 lore raw
Quoted 2 lines · Arnd Bergmann

We haven't quite made it for 2.5, but maybe we can merge this for 3.15.

Ok, I'm applying this immediately, before any new users pop up in staging or whatever..

Linus