From patchwork Mon Jul 1 21:48:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 11026789 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DB8AE14F6 for ; Mon, 1 Jul 2019 21:50:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D045C286E2 for ; Mon, 1 Jul 2019 21:50:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C4B3028764; Mon, 1 Jul 2019 21:50:02 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 70EEF28793 for ; Mon, 1 Jul 2019 21:50:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726878AbfGAVuC (ORCPT ); Mon, 1 Jul 2019 17:50:02 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:40496 "EHLO mx1.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726964AbfGAVuB (ORCPT ); Mon, 1 Jul 2019 17:50:01 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 36D474D3B2; Mon, 1 Jul 2019 23:50:00 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter05.heinlein-hosting.de (spamfilter05.heinlein-hosting.de [80.241.56.123]) (amavisd-new, port 10030) with ESMTP id cW93gW_hZrdu; Mon, 1 Jul 2019 23:49:52 +0200 (CEST) From: Hauke Mehrtens To: backports@vger.kernel.org Cc: Arend van Spriel Subject: [PATCH 04/18] backport-include: add empty lockdep_map structure in lockdep.h Date: Mon, 1 Jul 2019 23:48:59 +0200 Message-Id: <20190701214914.8066-5-hauke@hauke-m.de> In-Reply-To: <20190701214914.8066-1-hauke@hauke-m.de> References: <20190701214914.8066-1-hauke@hauke-m.de> MIME-Version: 1.0 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Arend van Spriel include/linux/rhashtable.h now uses struct lockdep_map unconditionally which is fine for upstream as lockdep.h defines an empty lockdep_map structure if CONFIG_LOCKDEP is not set. However, that is only true since kernel 4.15 so adding such definition in our lockdep.h to cover older kernels. Signed-off-by: Arend van Spriel --- backport/backport-include/linux/lockdep.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backport/backport-include/linux/lockdep.h b/backport/backport-include/linux/lockdep.h index 5a5d0d0e..12b91b4f 100644 --- a/backport/backport-include/linux/lockdep.h +++ b/backport/backport-include/linux/lockdep.h @@ -14,4 +14,10 @@ #endif /* CONFIG_LOCKDEP */ #endif /* LINUX_VERSION_IS_LESS(3,9,0) */ +#if LINUX_VERSION_IS_LESS(4,15,0) +#ifndef CONFIG_LOCKDEP +struct lockdep_map { }; +#endif /* CONFIG_LOCKDEP */ +#endif /* LINUX_VERSION_IS_LESS(4,15,0) */ + #endif /* __BACKPORT_LINUX_LOCKDEP_H */