From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753971Ab3JBJyk (ORCPT ); Wed, 2 Oct 2013 05:54:40 -0400 Received: from merlin.infradead.org ([205.233.59.134]:41075 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753374Ab3JBJvl (ORCPT ); Wed, 2 Oct 2013 05:51:41 -0400 Message-Id: <20131002092528.612813379@infradead.org> User-Agent: quilt/0.60-1 Date: Wed, 02 Oct 2013 11:22:27 +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 10/16] sched/wait: Collapse __wait_event_lock_irq() References: <20131002092217.784439754@infradead.org> Content-Disposition: inline; filename=peterz-wait-deduplicate-6.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/tty.h | 21 +---- include/linux/wait.h | 192 +++++++++++++++------------------------------------ 2 files changed, 63 insertions(+), 150 deletions(-) --- a/include/linux/wait.h +++ b/include/linux/wait.h @@ -648,20 +609,12 @@ do { \ #define __wait_event_lock_irq(wq, condition, lock, cmd) \ -do { \ - DEFINE_WAIT(__wait); \ - \ - for (;;) { \ - prepare_to_wait(&wq, &__wait, TASK_UNINTERRUPTIBLE); \ - if (condition) \ - break; \ - spin_unlock_irq(&lock); \ - cmd; \ - schedule(); \ - spin_lock_irq(&lock); \ - } \ - finish_wait(&wq, &__wait); \ -} while (0) + ___wait_event(wq, condition, TASK_UNINTERRUPTIBLE, 0, \ + ___wait_nop_ret, \ + spin_unlock_irq(&lock); \ + cmd; \ + schedule(); \ + spin_lock_irq(&lock)) /** * wait_event_lock_irq_cmd - sleep until a condition gets true. The