From 6610e72b6be86e56206a139330d0bdbc6d665c70 Mon Sep 17 00:00:00 2001
From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
Date: Thu, 25 Feb 2010 14:03:22 -0600
Subject: [PATCH] --- yaml --- r: 188307 b: refs/heads/master c:
 db61bfcfe2a68dc71402c270686cd73b80971efc h: refs/heads/master i:   188305:
 09cdc2d4d633971259d6ab2554889d26eadab703   188303:
 81ec2fa9064fb9416ae4ecc062693aa2531caa1f v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/scsi/hpsa_cmd.h | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d0072f0c51ab..b507d0e9da24 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff9fea94546afa2a496c15354533f06088347f6e
+refs/heads/master: db61bfcfe2a68dc71402c270686cd73b80971efc
diff --git a/trunk/drivers/scsi/hpsa_cmd.h b/trunk/drivers/scsi/hpsa_cmd.h
index 3e0abdf76689..43b6f1cffe34 100644
--- a/trunk/drivers/scsi/hpsa_cmd.h
+++ b/trunk/drivers/scsi/hpsa_cmd.h
@@ -313,12 +313,18 @@ struct CommandList {
 	void   *scsi_cmd;
 
 /* on 64 bit architectures, to get this to be 32-byte-aligned
- * it so happens we need no padding, on 32 bit systems,
- * we need 8 bytes of padding.   This does that.
+ * it so happens we need PAD_64 bytes of padding, on 32 bit systems,
+ * we need PAD_32 bytes of padding (see below).   This does that.
+ * If it happens that 64 bit and 32 bit systems need different
+ * padding, PAD_32 and PAD_64 can be set independently, and.
+ * the code below will do the right thing.
  */
-#define COMMANDLIST_PAD ((8 - sizeof(long))/4 * 8)
+#define IS_32_BIT ((8 - sizeof(long))/4)
+#define IS_64_BIT (!IS_32_BIT)
+#define PAD_32 (8)
+#define PAD_64 (0)
+#define COMMANDLIST_PAD (IS_32_BIT * PAD_32 + IS_64_BIT * PAD_64)
 	u8 pad[COMMANDLIST_PAD];
-
 };
 
 /* Configuration Table Structure */