From patchwork Wed May 18 18:07:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Desrochers X-Patchwork-Id: 623694 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3r93Ft1055z9t6S; Thu, 19 May 2016 04:51:46 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical-com.20150623.gappssmtp.com header.i=@canonical-com.20150623.gappssmtp.com header.b=AMG6taYj; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1b36ZG-0006sz-Rg; Wed, 18 May 2016 18:51:38 +0000 Received: from mail-qk0-f179.google.com ([209.85.220.179]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.76) (envelope-from ) id 1b35t2-0005wO-2E for kernel-team@lists.ubuntu.com; Wed, 18 May 2016 18:08:00 +0000 Received: by mail-qk0-f179.google.com with SMTP id x7so31848237qkd.3 for ; Wed, 18 May 2016 11:08:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=RiHJ9yqlAox6ztrtqxL3wCKM5F6AdfDQOBwKanF+cqE=; b=AMG6taYjdfr7WZS/Pkx7x5UwoETmI3ix4s4e2mYAopkXHTZoSKVzrNi2SmUHcnnjnz GLCdc5LdIe+AF/8UVdyvOozs5I7toWeRLiiSguYiVS8R0YglQKPT3Z2ahMKBZYSBYLwD klr4tt0i0lCtPcXLn0SNkC0bBBADbJOzuoZ3yLsO0N778O1FZh08t8Cu/W+k7qZUcQfJ eYG+jees7/xXCmUV/MBqQAfSwHRlYvw8xCMdOw7ksMepbL/dQOxliIj4pQ+b4eD6UzTP YSZwsTd8SAquL4OTiCpWxTBYKjVuouVWWtH0E0d7XW0qn2Ll4WzYvsEmC6Mc095j5Zsr E4PA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=RiHJ9yqlAox6ztrtqxL3wCKM5F6AdfDQOBwKanF+cqE=; b=goT2Gh8msaDzQs90U9E2Ut4Z2xPLL1vEypVhUACX2VTka6+1tpJzSbssUNcR1I9ONJ nMgC4ikumCA/a7kKXq+CXWvAHRRsFtuhTqlpJt/0cYBTWFe6I4uBd4QBIZazWmK226VZ Z96kVtaCWIwI8eoL3nwn5dDDggeFtf8Rl1C39RQHLGSZax8xhsna4vYH5F7RnGgQigrs /oBTIhYcD/dMXDNoKr0hvSn3nTfd0IKJNqkJz0i5vicbEdh5VWjNU38EV1tCMf9bujo0 oOsHN3lV1czIWHj99PeAYc3+8HbmGcg4E6h9XG0sSDN5ZHJvaCZUtof7cwjDj+5p/Fry E2pQ== X-Gm-Message-State: AOPr4FUOaglIdtwdSClVqIu31cvQFGOBkfMM4BO0dWi7tLmZSgBx72UxMAxRxwU9gFZduCta X-Received: by 10.55.80.136 with SMTP id e130mr9610015qkb.28.1463594879116; Wed, 18 May 2016 11:07:59 -0700 (PDT) Received: from D54250WYK.slashd.local (modemcable057.191-130-66.mc.videotron.ca. [66.130.191.57]) by smtp.gmail.com with ESMTPSA id 50sm4701013qgy.36.2016.05.18.11.07.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 May 2016 11:07:58 -0700 (PDT) From: Eric Desrochers To: kernel-team@lists.ubuntu.com Subject: [PATCH][SRU][wily] hpsa: move lockup_detected attribute to host attr Date: Wed, 18 May 2016 14:07:49 -0400 Message-Id: <1463594869-6335-1-git-send-email-eric.desrochers@canonical.com> X-Mailer: git-send-email 1.9.1 X-Mailman-Approved-At: Wed, 18 May 2016 18:51:37 +0000 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Eric Desrochers From: Tomas Henzl BugLink: https://bugs.launchpad.net/bugs/1581169 This patch fixes a 'general protection fault' issue by moving the attribute to where it was likely meant. Signed-off-by: Tomas Henzl Signed-off-by: Don Brace Signed-off-by: Martin K. Petersen (cherry picked from commit fb53c439d84387621c53808a3957ffd9876e5094) Signed-off-by: Eric Desrochers --- drivers/scsi/hpsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index cab4e98..c8d00ce 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -744,7 +744,6 @@ static struct device_attribute *hpsa_sdev_attrs[] = { &dev_attr_lunid, &dev_attr_unique_id, &dev_attr_hp_ssd_smart_path_enabled, - &dev_attr_lockup_detected, NULL, }; @@ -756,6 +755,7 @@ static struct device_attribute *hpsa_shost_attrs[] = { &dev_attr_resettable, &dev_attr_hp_ssd_smart_path_status, &dev_attr_raid_offload_debug, + &dev_attr_lockup_detected, NULL, };