From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C122C433EF for ; Wed, 2 Mar 2022 04:36:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239505AbiCBEhA (ORCPT ); Tue, 1 Mar 2022 23:37:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239493AbiCBEgb (ORCPT ); Tue, 1 Mar 2022 23:36:31 -0500 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C88BB10AB for ; Tue, 1 Mar 2022 20:35:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=EhwakpZsgRjAK3Qs90JQZNZYd0i0DAXh3eXk7fPyF6I=; b=NJWTMKXzFFlrerlPPV5LQfwARD PYTUjrgAHD0B58nOKjnUtIEst6VYbu2rpsN2+x+bZLdRvP8x7dUxalFJ34w7MOcefhjO/b06yKzJ9 9Me+6VUVoA7eT035Z6Hq+AU35TyUdQtvBs0latqDqJ2WY0pWiglkcsz8hNjvNCBCGSMgPs8PFdAdM 6XYG1XlwgxD+zL9QmzmKISBOsBQj7F9uKF2V1UCV8WbUM+ThQtH8NbpDOROhODM5cfAqkQpBtYV2f +ECdgRZ2NffjImFoRCz9n9IjM8w3UoMKg1nSMTmV4rp32zsoUZpUA8VNjBH9myoQ7Eun7+7IASu+x ptU5QgUQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nPGhS-00AF7B-9D; Wed, 02 Mar 2022 04:34:54 +0000 From: "Matthew Wilcox (Oracle)" To: Kees Cook , Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Daniel Bristot de Oliveira , Linus Torvalds Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org Subject: [PATCH 07/19] wait: Parameterize the return variable to __wait_event_interruptible_timeout() Date: Wed, 2 Mar 2022 04:34:39 +0000 Message-Id: <20220302043451.2441320-8-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220302043451.2441320-1-willy@infradead.org> References: <20220302043451.2441320-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Macros should not refer to variables which aren't in their arguments. Pass the name from its caller. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/wait.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/wait.h b/include/linux/wait.h index 5f2c43373061..a4a17f3b6871 100644 --- a/include/linux/wait.h +++ b/include/linux/wait.h @@ -503,7 +503,7 @@ do { \ __ret; \ }) -#define __wait_event_interruptible_timeout(wq_head, condition, timeout) \ +#define __wait_event_interruptible_timeout(wq_head, condition, timeout, __ret) \ ___wait_event(wq_head, ___wait_cond_timeout(condition, __ret), \ TASK_INTERRUPTIBLE, 0, timeout, \ __ret = schedule_timeout(__ret)) @@ -534,7 +534,7 @@ do { \ might_sleep(); \ if (!___wait_cond_timeout(condition, __ret)) \ __ret = __wait_event_interruptible_timeout(wq_head, \ - condition, timeout); \ + condition, timeout, __ret); \ __ret; \ }) -- 2.34.1