From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754013Ab3JBJyq (ORCPT ); Wed, 2 Oct 2013 05:54:46 -0400 Received: from merlin.infradead.org ([205.233.59.134]:41074 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753185Ab3JBJvl (ORCPT ); Wed, 2 Oct 2013 05:51:41 -0400 Message-Id: <20131002092528.254863348@infradead.org> User-Agent: quilt/0.60-1 Date: Wed, 02 Oct 2013 11:22:22 +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 05/16] sched/wait: Collapse __wait_event() References: <20131002092217.784439754@infradead.org> Content-Disposition: inline; filename=peterz-wait-deduplicate-1.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Reduce macro complexity by using the new ___wait_event() helper. No change in behaviour, identical generated code. Reviewed-by: Oleg Nesterov Signed-off-by: Peter Zijlstra --- include/linux/wait.h | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) --- a/include/linux/wait.h +++ b/include/linux/wait.h @@ -224,17 +224,8 @@ __out: ; \ } while (0) #define __wait_event(wq, condition) \ -do { \ - DEFINE_WAIT(__wait); \ - \ - for (;;) { \ - prepare_to_wait(&wq, &__wait, TASK_UNINTERRUPTIBLE); \ - if (condition) \ - break; \ - schedule(); \ - } \ - finish_wait(&wq, &__wait); \ -} while (0) + ___wait_event(wq, condition, TASK_UNINTERRUPTIBLE, 0, \ + ___wait_nop_ret, schedule()) /** * wait_event - sleep until a condition gets true