diff options
| author | Robert Love <rml@tech9.net> | 2002-06-02 20:55:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-02 20:55:19 -0700 |
| commit | f0245aacdf050a70345797eb7e8da74a9c16b3dc (patch) | |
| tree | 3804cee2d7b3a9ebcb3260a05d45805a3d4a730f /kernel/sched.c | |
| parent | 7723316a83dd8076af3d3b4222d972f295a9218f (diff) | |
[PATCH] remove wq_lock_t cruft
This patch removes the whole wq_lock_t abstraction, forcing the behavior
to be that of a standard spinlock and changes all the wq_lock code in
the tree appropriately.
Removes lots of code - always a Good Thing to me. New behavior is same
as previous behavior (USE_RW_WAIT_QUEUE_SPINLOCK unset).
Diffstat (limited to 'kernel/sched.c')
| -rw-r--r-- | kernel/sched.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index bbff0f9ecf07..3eb95a37736d 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -903,9 +903,9 @@ void __wake_up(wait_queue_head_t *q, unsigned int mode, int nr_exclusive) if (unlikely(!q)) return; - wq_read_lock_irqsave(&q->lock, flags); + spin_lock_irqsave(&q->lock, flags); __wake_up_common(q, mode, nr_exclusive); - wq_read_unlock_irqrestore(&q->lock, flags); + spin_unlock_irqrestore(&q->lock, flags); } void complete(struct completion *x) @@ -944,14 +944,14 @@ void wait_for_completion(struct completion *x) init_waitqueue_entry(&wait, current); #define SLEEP_ON_HEAD \ - wq_write_lock_irqsave(&q->lock,flags); \ + spin_lock_irqsave(&q->lock,flags); \ __add_wait_queue(q, &wait); \ - wq_write_unlock(&q->lock); + spin_unlock(&q->lock); #define SLEEP_ON_TAIL \ - wq_write_lock_irq(&q->lock); \ + spin_lock_irq(&q->lock); \ __remove_wait_queue(q, &wait); \ - wq_write_unlock_irqrestore(&q->lock,flags); + spin_unlock_irqrestore(&q->lock, flags); void interruptible_sleep_on(wait_queue_head_t *q) { |