patch for gcc-4.6, eliminate duplicate, from 2.6.36
Thierry Parmentelat [Fri, 10 Jun 2011 03:55:59 +0000 (05:55 +0200)]
kernel-2.6.spec
linux-2.6-10002-gcc-4.6-sense_buffer.patch [new file with mode: 0644]

index 8823eef..0331100 100644 (file)
@@ -684,6 +684,7 @@ Patch20: linux-2.6-680-htb-hysteresis-tso.patch
 
 Patch10000: linux-2.6-10000-gcc-4.5.patch
 Patch10001: linux-2.6-10001-gcc-4.6-warnoff.patch
+Patch10002: linux-2.6-10002-gcc-4.6-sense_buffer.patch
 Patch11000: linux-2.6-11000-gcc-4.6.patch
 # empty final patch file to facilitate testing of kernel patches
 Patch999999: linux-kernel-test.patch
@@ -999,6 +1000,7 @@ ApplyPatch linux-2.6-660-nmi-watchdog-default.patch
 ApplyPatch linux-2.6-680-htb-hysteresis-tso.patch
 ApplyPatch linux-2.6-10000-gcc-4.5.patch
 ApplyPatch linux-2.6-10001-gcc-4.6-warnoff.patch
+ApplyPatch linux-2.6-10002-gcc-4.6-sense_buffer.patch
 ApplyPatch linux-2.6-11000-gcc-4.6.patch
 #### Planet-Lab ####
 
diff --git a/linux-2.6-10002-gcc-4.6-sense_buffer.patch b/linux-2.6-10002-gcc-4.6-sense_buffer.patch
new file mode 100644 (file)
index 0000000..7fa54e6
--- /dev/null
@@ -0,0 +1,29 @@
+------------------
+From: Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
+
+commit df30e5059681ed0671c9cc6ff702fe9ca7f20042 upstream.
+
+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>
+Signed-off-by: James Bottomley <James.Bottomley@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/scsi/pmcraid.h |    1 -
+ 1 file changed, 1 deletion(-)
+--- 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;