From patchwork Sun Sep 23 17:45:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 10611849 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 B26AE913 for ; Sun, 23 Sep 2018 17:45:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 52E8A294A3 for ; Sun, 23 Sep 2018 17:45:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 47A8129FA8; Sun, 23 Sep 2018 17:45:51 +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 E37A6294A3 for ; Sun, 23 Sep 2018 17:45:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726947AbeIWXoE (ORCPT ); Sun, 23 Sep 2018 19:44:04 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:38496 "EHLO mx1.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726467AbeIWXoE (ORCPT ); Sun, 23 Sep 2018 19:44:04 -0400 Received: from smtp1.mailbox.org (unknown [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 644C748FB8; Sun, 23 Sep 2018 19:45:48 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id Bxd5MeYcf2uc; Sun, 23 Sep 2018 19:45:46 +0200 (CEST) From: Hauke Mehrtens To: johannes@sipsolutions.net Cc: backports@vger.kernel.org, john@phrozen.org, Hauke Mehrtens Subject: [PATCH 08/10] patches: remove .coredump from struct driver for kernel < 4.16 Date: Sun, 23 Sep 2018 19:45:33 +0200 Message-Id: <20180923174535.16198-9-hauke@hauke-m.de> In-Reply-To: <20180923174535.16198-1-hauke@hauke-m.de> References: <20180923174535.16198-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 Kernel 4.16 added a new .coredump member to the driver structure which can be implemented by drivers. Remove this member on older kernel versions as they do not support this feature. Signed-off-by: Hauke Mehrtens --- patches/0088-coredump.cocci | 93 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 patches/0088-coredump.cocci diff --git a/patches/0088-coredump.cocci b/patches/0088-coredump.cocci new file mode 100644 index 00000000..329e0315 --- /dev/null +++ b/patches/0088-coredump.cocci @@ -0,0 +1,93 @@ +@r1@ +identifier drv, fn; +@@ +static struct pci_driver drv = { + .driver = { ++#if LINUX_VERSION_IS_GEQ(4,16,0) + .coredump = fn, ++#endif + ... + }, + ... +}; + +@r11 depends on r1@ +identifier r1.fn; +@@ ++#if LINUX_VERSION_IS_GEQ(4,16,0) +fn(...) +{ + ... +} ++#endif + + +@r2@ +identifier drv, fn; +@@ + static struct pci_driver drv = { ++#if LINUX_VERSION_IS_GEQ(4,16,0) + .driver.coredump = fn, ++#endif + ... + }; + +@r21 depends on r2@ +identifier r2.fn; +@@ ++#if LINUX_VERSION_IS_GEQ(4,16,0) +fn(...) +{ + ... +} ++#endif + + +@r3@ +identifier drv, fn; +@@ +static struct usb_driver drv = { + .drvwrap.driver = { ++#if LINUX_VERSION_IS_GEQ(4,16,0) + .coredump = fn, ++#endif + ... + }, + ... +}; + + +@r31 depends on r3@ +identifier r3.fn; +@@ ++#if LINUX_VERSION_IS_GEQ(4,16,0) +fn(...) +{ + ... +} ++#endif + + +@r4@ +identifier driver, fn; +@@ + static struct sdio_driver driver = { + .drv = { ++#if LINUX_VERSION_IS_GEQ(4,16,0) + .coredump = fn, ++#endif + ... + }, + ... +}; + + +@r41 depends on r4@ +identifier r4.fn; +@@ ++#if LINUX_VERSION_IS_GEQ(4,16,0) +fn(...) +{ + ... +} ++#endif