From patchwork Tue Jan 31 13:46:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arend van Spriel X-Patchwork-Id: 9547343 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 B9E806016C for ; Tue, 31 Jan 2017 13:56:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ABE9326E8A for ; Tue, 31 Jan 2017 13:56:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A066328329; Tue, 31 Jan 2017 13:56:53 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 C852326E8A for ; Tue, 31 Jan 2017 13:56:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751964AbdAaN4v (ORCPT ); Tue, 31 Jan 2017 08:56:51 -0500 Received: from lpdvrndsmtp01.broadcom.com ([192.19.229.170]:50255 "EHLO rnd-relay.smtp.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752030AbdAaN4u (ORCPT ); Tue, 31 Jan 2017 08:56:50 -0500 X-Greylist: delayed 552 seconds by postgrey-1.27 at vger.kernel.org; Tue, 31 Jan 2017 08:56:16 EST Received: from mail-irv-17.broadcom.com (mail-irv-17.lvn.broadcom.net [10.75.224.233]) by rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id 3DFA430C212; Tue, 31 Jan 2017 05:46:56 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com 3DFA430C212 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1485870416; bh=82wuHytTLEur3FlLez/fOvwNefXZbmkQDwZWcrRFNLA=; h=From:To:Cc:Subject:Date:From; b=WacbXzVGdJJVVWL3rqTUrnkuHgeQChqsavHqafpnE3PwmTBdhcT3B/mgIWuG8tguu mQn/0L5w1edcOC3sHVl7kjOuc/VRLD8HmcSMAqVCNFGPTa7t6nkvD5fG2HWv/6+iXN ooj1TDYiDyt4Ia428ju5jxNt3yE2UK+e8JQMFeio= Received: from jenkins-cam-14.cam.broadcom.com (jenkins-cam-14.cam.broadcom.com [10.177.128.77]) by mail-irv-17.broadcom.com (Postfix) with ESMTP id A613D81F52; Tue, 31 Jan 2017 05:46:55 -0800 (PST) Received: by jenkins-cam-14.cam.broadcom.com (Postfix, from userid 25152) id F030FB851BE; Tue, 31 Jan 2017 13:46:54 +0000 (GMT) From: Arend van Spriel To: Luca Coelho Cc: backports@vger.kernel.org, Arend van Spriel Subject: [PATCH] backports: adjustments: fix devcoredump patch for class_groups Date: Tue, 31 Jan 2017 13:46:44 +0000 Message-Id: <1485870404-28663-1-git-send-email-arend.vanspriel@broadcom.com> X-Mailer: git-send-email 1.9.1 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since... commit f76d25275c314defb684fdd692239507001774bc Author: Greg Kroah-Hartman Date: Mon Nov 28 16:41:58 2016 +0100 driver core: devcoredump: convert to use class_groups it is using struct class::class_groups. Update the devcoredump patch file accordingly. Signed-off-by: Arend van Spriel --- patches/backport-adjustments/devcoredump.patch | 43 +++++++++++++++++++++----- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/patches/backport-adjustments/devcoredump.patch b/patches/backport-adjustments/devcoredump.patch index f35e881..ab38ac6 100644 --- a/patches/backport-adjustments/devcoredump.patch +++ b/patches/backport-adjustments/devcoredump.patch @@ -10,7 +10,7 @@ index 240374f..8bb376b 100644 static struct class devcd_class; -@@ -40,6 +41,10 @@ static bool devcd_disabled; +@@ -40,6 +41,10 @@ /* if data isn't read by userspace after 5 minutes then delete it */ #define DEVCD_TIMEOUT (HZ * 60 * 5) @@ -41,7 +41,7 @@ index 240374f..8bb376b 100644 device_del(&devcd->devcd_dev); put_device(&devcd->devcd_dev); } -@@ -115,6 +122,7 @@ static struct bin_attribute devcd_attr_data = { +@@ -115,6 +122,7 @@ static ssize_t devcd_data_write(struct file *filp, struct kobject *kobj, .write = devcd_data_write, }; @@ -49,7 +49,7 @@ index 240374f..8bb376b 100644 static struct bin_attribute *devcd_dev_bin_attrs[] = { &devcd_attr_data, NULL, }; -@@ -126,6 +134,7 @@ static const struct attribute_group devcd_dev_group = { +@@ -126,6 +134,7 @@ static ssize_t devcd_data_write(struct file *filp, struct kobject *kobj, static const struct attribute_group *devcd_dev_groups[] = { &devcd_dev_group, NULL, }; @@ -57,17 +57,44 @@ index 240374f..8bb376b 100644 static int devcd_free(struct device *dev, void *data) { -@@ -170,7 +179,9 @@ static struct class devcd_class = { +@@ -160,20 +169,35 @@ static ssize_t disabled_store(struct class *class, struct class_attribute *attr, + + return count; + } ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) ++static struct class_attribute devcd_class_attrs[] = { ++ __ATTR_RW(disabled), ++ __ATTR_NULL ++}; ++#else + static CLASS_ATTR_RW(disabled); + + static struct attribute *devcd_class_attrs[] = { + &class_attr_disabled.attr, + NULL, + }; +-ATTRIBUTE_GROUPS(devcd_class); ++static const struct attribute_group devcd_class_group = { ++ .attrs = devcd_class_attrs, ++}; ++#endif + + static struct class devcd_class = { .name = "devcoredump", .owner = THIS_MODULE, .dev_release = devcd_dev_release, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0) .dev_groups = devcd_dev_groups, +#endif - .class_attrs = devcd_class_attrs, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) ++ .class_attrs = devcd_class_attrs, ++#else + .class_groups = devcd_class_groups, ++#endif }; -@@ -231,6 +242,14 @@ static void devcd_free_sgtable(void *data) + static ssize_t devcd_readv(char *buffer, loff_t offset, size_t count, +@@ -233,6 +257,14 @@ static void devcd_free_sgtable(void *data) _devcd_free_sgtable(data); } @@ -82,7 +109,7 @@ index 240374f..8bb376b 100644 /** * devcd_read_from_table - copy data from sg_table to a given buffer * and return the number of bytes read -@@ -314,6 +333,11 @@ void dev_coredumpm(struct device *dev, struct module *owner, +@@ -316,6 +348,11 @@ void dev_coredumpm(struct device *dev, struct module *owner, if (device_add(&devcd->devcd_dev)) goto put_device; @@ -94,7 +121,7 @@ index 240374f..8bb376b 100644 if (sysfs_create_link(&devcd->devcd_dev.kobj, &dev->kobj, "failing_device")) /* nothing - symlink will be missing */; -@@ -356,15 +380,13 @@ void dev_coredumpsg(struct device *dev, struct scatterlist *table, +@@ -358,15 +395,13 @@ void dev_coredumpsg(struct device *dev, struct scatterlist *table, } EXPORT_SYMBOL_GPL(dev_coredumpsg);