ipc/mqueue.c: fix wrong use of schedule_hrtimeout_range_clock()
authorWanlong Gao <gaowanlong@cn.fujitsu.com>
Tue, 1 Nov 2011 00:06:35 +0000 (17:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Nov 2011 00:30:44 +0000 (17:30 -0700)
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>
ipc/mqueue.c

index ed049ea568f45ee6026941b5d8335853c33efcd8..2e0ecfcc881dd124e3b2a2d868971fd1e6dea6f8 100644 (file)
@@ -449,8 +449,8 @@ static int wq_sleep(struct mqueue_inode_info *info, int sr,
                set_current_state(TASK_INTERRUPTIBLE);
 
                spin_unlock(&info->lock);
-               time = schedule_hrtimeout_range_clock(timeout,
-                   HRTIMER_MODE_ABS, 0, CLOCK_REALTIME);
+               time = schedule_hrtimeout_range_clock(timeout, 0,
+                       HRTIMER_MODE_ABS, CLOCK_REALTIME);
 
                while (ewp->state == STATE_PENDING)
                        cpu_relax();