From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756368Ab3I3Pdo (ORCPT ); Mon, 30 Sep 2013 11:33:44 -0400 Received: from merlin.infradead.org ([205.233.59.134]:44564 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755847Ab3I3Pcf (ORCPT ); Mon, 30 Sep 2013 11:32:35 -0400 Message-Id: <20130930152624.883144528@infradead.org> User-Agent: quilt/0.60-1 Date: Mon, 30 Sep 2013 17:22:45 +0200 From: Peter Zijlstra To: Ingo Molnar Cc: Oleg Nesterov , Paul McKenney , Linus Torvalds , Thomas Gleixner , Andrew Morton , linux-kernel@vger.kernel.org, Peter Zijlstra Subject: [PATCH 3/6] sched, wait: Change the wait_exclusive control flow References: <20130930152242.207382649@infradead.org> Content-Disposition: inline; filename=peterz-wait-change-exclusive.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Purely a preparatory patch; it changes the control flow to match what will soon be generated by generic code so that that patch can be a unity transform. Signed-off-by: Peter Zijlstra --- include/linux/wait.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) --- a/include/linux/wait.h +++ b/include/linux/wait.h @@ -430,23 +430,24 @@ do { \ #define __wait_event_interruptible_exclusive(wq, condition, ret) \ do { \ + __label__ __out; \ DEFINE_WAIT(__wait); \ \ for (;;) { \ prepare_to_wait_exclusive(&wq, &__wait, \ TASK_INTERRUPTIBLE); \ - if (condition) { \ - finish_wait(&wq, &__wait); \ + if (condition) \ break; \ - } \ if (signal_pending(current)) { \ ret = -ERESTARTSYS; \ abort_exclusive_wait(&wq, &__wait, \ TASK_INTERRUPTIBLE, NULL); \ - break; \ + goto __out; \ } \ schedule(); \ } \ + finish_wait(&wq, &__wait); \ +__out: ; \ } while (0) #define wait_event_interruptible_exclusive(wq, condition) \