Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2011-07-05 16:23:37 -0400
committerJeff Mahoney <jeffm@suse.com>2011-07-05 16:23:37 -0400
commit0dfecd602dd49a0faaefc021a0c21884c9065ea1 (patch)
treeb50d38a22c4fe622a7c7e1ce73b99bf91b6326f0
parent371b5155749f3d194da6f1cc3b0484309d3f6108 (diff)
- patches.suse/scsi-pmcraid-remove-duplicate-struct-member:rpm-2.6.32.42-0.7
pmcraid: remove duplicate struct member.
-rw-r--r--kernel-source.changes6
-rw-r--r--patches.suse/scsi-pmcraid-remove-duplicate-struct-member34
-rw-r--r--series.conf1
3 files changed, 41 insertions, 0 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index 986338857c..593dbc4215 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Jul 5 22:23:35 CEST 2011 - jeffm@suse.com
+
+- patches.suse/scsi-pmcraid-remove-duplicate-struct-member:
+ pmcraid: remove duplicate struct member.
+
+-------------------------------------------------------------------
Tue Jul 5 22:22:52 CEST 2011 - jeffm@suse.com
- patches.drivers/0272-cnic-Prevent-status-block-race-conditions-with-hardw.patch:
diff --git a/patches.suse/scsi-pmcraid-remove-duplicate-struct-member b/patches.suse/scsi-pmcraid-remove-duplicate-struct-member
new file mode 100644
index 0000000000..f2a9371aac
--- /dev/null
+++ b/patches.suse/scsi-pmcraid-remove-duplicate-struct-member
@@ -0,0 +1,34 @@
+From: Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
+Date: Mon, 25 Oct 2010 15:41:54 -0700
+Subject: [SCSI] pmcraid: remove duplicate struct member
+Patch-mainline: v2.6.37-rc1
+Git-commit: df30e5059681ed0671c9cc6ff702fe9ca7f20042
+
+sense_buffer is both a direct member of struct pmcraid_cmd as well as
+an indirect one via an anonymous union and struct. Fix this clash by
+eliminating the direct member in favour of the anonymous struct/union
+one. The name duplication apparently isn't noticed by gcc versions
+earlier than 4.4
+
+Reported-by: Andi Kleen <ak@linux.intel.com>
+Signed-off-by: Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
+Cc: Stable Tree <stable@kernel.org>
+Signed-off-by: James Bottomley <James.Bottomley@suse.de>
+Acked-by: Jeff Mahoney <jeffm@suse.com>
+---
+ drivers/scsi/pmcraid.h | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
+index 6cfa014..dd78f9e 100644
+--- a/drivers/scsi/pmcraid.h
++++ b/drivers/scsi/pmcraid.h
+@@ -568,7 +568,6 @@ struct pmcraid_cmd {
+ struct pmcraid_control_block *ioa_cb;
+ dma_addr_t ioa_cb_bus_addr;
+ dma_addr_t dma_handle;
+- u8 *sense_buffer;
+
+ /* pointer to mid layer structure of SCSI commands */
+ struct scsi_cmnd *scsi_cmd;
+
diff --git a/series.conf b/series.conf
index 805f8f7a5d..60cdfd62a5 100644
--- a/series.conf
+++ b/series.conf
@@ -3622,6 +3622,7 @@
patches.suse/dpt_i2o-Use-GFP_ATOMIC-when-a-lock-is-held.patch
patches.suse/ipr-add-endian-swap-enablement-for-64-bit-ad.patch
patches.suse/pmcraid-MSI-X-support-and-other-changes.patch
+ patches.suse/scsi-pmcraid-remove-duplicate-struct-member
patches.suse/ipr-add-writeq-definition-if-needed.patch
patches.suse/arcmsr-Support-1024-scatter-gather-list-entr.patch
patches.suse/ibmvfc-Fix-soft-lockup-on-resume.patch