diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-11 04:17:42 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-11 04:17:42 -0500 |
| commit | f437e8b53eab92a5829e65781e29aed23d8ffd0c (patch) | |
| tree | 48982c8818a4ac5cddb84ca6a1d55620eb9680ee /kernel/sched.c | |
| parent | 140573d33b703194b7e1893711e78b7f546cca7c (diff) | |
| parent | 8e4921515c1a379539607eb443d51c30f4f7f338 (diff) | |
Merge commit 'v2.6.29-rc4' into sched/core
Diffstat (limited to 'kernel/sched.c')
| -rw-r--r-- | kernel/sched.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 1dae85a1221a..fcc3483e9955 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -4793,8 +4793,8 @@ EXPORT_SYMBOL(default_wake_function); | |||
| 4793 | * started to run but is not in state TASK_RUNNING. try_to_wake_up() returns | 4793 | * started to run but is not in state TASK_RUNNING. try_to_wake_up() returns |
| 4794 | * zero in this (rare) case, and we handle it by continuing to scan the queue. | 4794 | * zero in this (rare) case, and we handle it by continuing to scan the queue. |
| 4795 | */ | 4795 | */ |
| 4796 | static void __wake_up_common(wait_queue_head_t *q, unsigned int mode, | 4796 | void __wake_up_common(wait_queue_head_t *q, unsigned int mode, |
| 4797 | int nr_exclusive, int sync, void *key) | 4797 | int nr_exclusive, int sync, void *key) |
| 4798 | { | 4798 | { |
| 4799 | wait_queue_t *curr, *next; | 4799 | wait_queue_t *curr, *next; |
| 4800 | 4800 | ||