From patchwork Mon Aug 21 22:28:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 9913893 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 86717603FF for ; Mon, 21 Aug 2017 22:28:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 66B15286AA for ; Mon, 21 Aug 2017 22:28:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5B8B4286B8; Mon, 21 Aug 2017 22:28:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 16276286AB for ; Mon, 21 Aug 2017 22:28:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754293AbdHUW2p (ORCPT ); Mon, 21 Aug 2017 18:28:45 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:42931 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754260AbdHUW2p (ORCPT ); Mon, 21 Aug 2017 18:28:45 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id D868B45FEA; Tue, 22 Aug 2017 00:28:43 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id 8wpdsWwPRXXU; Tue, 22 Aug 2017 00:28:42 +0200 (CEST) From: Hauke Mehrtens To: johannes@sipsolutions.net Cc: backports@vger.kernel.org, Hauke Mehrtens Subject: [PATCH 10/21] header: rename wait_queue_entry_t to wait_queue_t Date: Tue, 22 Aug 2017 00:28:06 +0200 Message-Id: <20170821222817.17376-11-hauke@hauke-m.de> In-Reply-To: <20170821222817.17376-1-hauke@hauke-m.de> References: <20170821222817.17376-1-hauke@hauke-m.de> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In kernel 4.13 wait_queue_t was renamed to wait_queue_entry_t, reverse this for older kernel versions. Signed-off-by: Hauke Mehrtens --- backport/backport-include/linux/wait.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/backport/backport-include/linux/wait.h b/backport/backport-include/linux/wait.h index 3059ff1d..c4b1114e 100644 --- a/backport/backport-include/linux/wait.h +++ b/backport/backport-include/linux/wait.h @@ -76,4 +76,8 @@ wait_on_bit_timeout(void *word, int bit, unsigned mode, unsigned long timeout) #endif #endif +#if LINUX_VERSION_IS_LESS(4,13,0) +#define wait_queue_entry_t wait_queue_t +#endif + #endif /* __BACKPORT_LINUX_WAIT_H */