From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753922AbbIWIr4 (ORCPT ); Wed, 23 Sep 2015 04:47:56 -0400 Received: from terminus.zytor.com ([198.137.202.10]:34973 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753411AbbIWIrw (ORCPT ); Wed, 23 Sep 2015 04:47:52 -0400 Date: Wed, 23 Sep 2015 01:47:17 -0700 From: tip-bot for Juri Lelli Message-ID: Cc: peterz@infradead.org, hpa@zytor.com, torvalds@linux-foundation.org, efault@gmx.de, luca.abeni@unitn.it, linux-kernel@vger.kernel.org, mingo@kernel.org, juri.lelli@arm.com, tglx@linutronix.de Reply-To: peterz@infradead.org, hpa@zytor.com, efault@gmx.de, torvalds@linux-foundation.org, luca.abeni@unitn.it, linux-kernel@vger.kernel.org, juri.lelli@arm.com, mingo@kernel.org, tglx@linutronix.de In-Reply-To: <1441188096-23021-4-git-send-email-juri.lelli@arm.com> References: <1441188096-23021-4-git-send-email-juri.lelli@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/deadline, locking/rtmutex: Fix open coded check in rt_mutex_waiter_less() Git-Commit-ID: f52405757e4e9bddd868d6b8ca501d58f292969f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: f52405757e4e9bddd868d6b8ca501d58f292969f Gitweb: http://git.kernel.org/tip/f52405757e4e9bddd868d6b8ca501d58f292969f Author: Juri Lelli AuthorDate: Wed, 2 Sep 2015 11:01:35 +0100 Committer: Ingo Molnar CommitDate: Wed, 23 Sep 2015 09:51:25 +0200 sched/deadline, locking/rtmutex: Fix open coded check in rt_mutex_waiter_less() rt_mutex_waiter_less() check of task deadlines is open coded. Since this is subject to wraparound bugs, make it use the correct helper. Reported-by: Luca Abeni Signed-off-by: Juri Lelli Signed-off-by: Peter Zijlstra (Intel) Cc: Linus Torvalds Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1441188096-23021-4-git-send-email-juri.lelli@arm.com Signed-off-by: Ingo Molnar --- kernel/locking/rtmutex.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c index 7781d80..35e9bfc 100644 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -158,7 +158,8 @@ rt_mutex_waiter_less(struct rt_mutex_waiter *left, * then right waiter has a dl_prio() too. */ if (dl_prio(left->prio)) - return (left->task->dl.deadline < right->task->dl.deadline); + return dl_time_before(left->task->dl.deadline, + right->task->dl.deadline); return 0; }