Home| summaryrefslogtreecommitdiff |
| author | Jeff Mahoney <jeffm@suse.com> | 2011-07-05 20:23:37 (GMT) |
|---|---|---|
| committer | Jeff Mahoney <jeffm@suse.com> | 2011-07-05 20:23:37 (GMT) |
| commit | 0dfecd602dd49a0faaefc021a0c21884c9065ea1 (patch) (side-by-side diff) | |
| tree | b50d38a22c4fe622a7c7e1ce73b99bf91b6326f0 | |
| parent | 371b5155749f3d194da6f1cc3b0484309d3f6108 (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.changes | 6 | ||||
| -rw-r--r-- | patches.suse/scsi-pmcraid-remove-duplicate-struct-member | 34 | ||||
| -rw-r--r-- | series.conf | 1 |
3 files changed, 41 insertions, 0 deletions
diff --git a/kernel-source.changes b/kernel-source.changes index 9863388..593dbc4 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,7 +1,13 @@ ------------------------------------------------------------------- +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: cnic: Prevent status block race conditions with hardware (FATE#311458 FATE#311459 FATE#311460 FATE#311461 FATE#311462 bnc#698050). 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 0000000..f2a9371 --- a/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 805f8f7..60cdfd6 100644 --- a/series.conf +++ b/series.conf @@ -3619,12 +3619,13 @@ patches.suse/scsi-convert-discard-to-REQ_TYPE_FS-from-REQ_TYPE_B.patch patches.suse/scsi-use-REQ_TYPE_FS-for-flush-request.patch patches.suse/hptiop-Eliminate-a-NULL-pointer-dereference.patch 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 patches.suse/ibmvfc-Add-support-for-fc_block_scsi_eh.patch patches.suse/ibmvfc-Driver-version-1.0.8.patch patches.suse/ibmvscsi-Fix-softlockup-on-resume.patch |