diff options
author | Wanlong Gao <gaowanlong@cn.fujitsu.com> | 2011-10-31 20:06:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-31 20:30:44 -0400 |
commit | 32ea845d5bafc37b7406bea1aee3005407cb0900 (patch) | |
tree | 54cfdc8a8fce66a7371b3616fc18b4c676a6fbdd /ipc | |
parent | fc360bd9cdcf875639a77f07fafec26699c546f3 (diff) |
ipc/mqueue.c: fix wrong use of schedule_hrtimeout_range_clock()
Fix the wrong use of schedule_hrtimeout_range_clock() in wq_sleep(),
although it is harmless for the syscall mq_timed* now. It was introduced
by 9ca7d8e ("mqueue: Convert message queue timeout to use hrtimers").
Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
Cc: Carsten Emde <C.Emde@osadl.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Manfred Spraul <manfred@colorfullife.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'ipc')
-rw-r--r-- | ipc/mqueue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c index ed049ea568f4..2e0ecfcc881d 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c | |||
@@ -449,8 +449,8 @@ static int wq_sleep(struct mqueue_inode_info *info, int sr, | |||
449 | set_current_state(TASK_INTERRUPTIBLE); | 449 | set_current_state(TASK_INTERRUPTIBLE); |
450 | 450 | ||
451 | spin_unlock(&info->lock); | 451 | spin_unlock(&info->lock); |
452 | time = schedule_hrtimeout_range_clock(timeout, | 452 | time = schedule_hrtimeout_range_clock(timeout, 0, |
453 | HRTIMER_MODE_ABS, 0, CLOCK_REALTIME); | 453 | HRTIMER_MODE_ABS, CLOCK_REALTIME); |
454 | 454 | ||
455 | while (ewp->state == STATE_PENDING) | 455 | while (ewp->state == STATE_PENDING) |
456 | cpu_relax(); | 456 | cpu_relax(); |