From 96e28667a679976faefe255eb4d4907cf65e5c9a Mon Sep 17 00:00:00 2001
From: Brian King <brking@linux.vnet.ibm.com>
Date: Fri, 14 Nov 2008 13:33:52 -0600
Subject: [PATCH] --- yaml --- r: 124616 b: refs/heads/master c:
 5919ce29085f4ca080054fde5feef8f8b3405261 h: refs/heads/master v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/scsi/ibmvscsi/ibmvfc.h | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 12a2e50f7cd2..199e5fdd0341 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4081b77c3a86151d2eaeed9d568a34dd0982ed52
+refs/heads/master: 5919ce29085f4ca080054fde5feef8f8b3405261
diff --git a/trunk/drivers/scsi/ibmvscsi/ibmvfc.h b/trunk/drivers/scsi/ibmvscsi/ibmvfc.h
index f0c0212a7460..526bca743c81 100644
--- a/trunk/drivers/scsi/ibmvscsi/ibmvfc.h
+++ b/trunk/drivers/scsi/ibmvscsi/ibmvfc.h
@@ -523,10 +523,10 @@ enum ibmvfc_async_event {
 };
 
 struct ibmvfc_crq {
-	u8 valid;
-	u8 format;
+	volatile u8 valid;
+	volatile u8 format;
 	u8 reserved[6];
-	u64 ioba;
+	volatile u64 ioba;
 }__attribute__((packed, aligned (8)));
 
 struct ibmvfc_crq_queue {
@@ -536,13 +536,13 @@ struct ibmvfc_crq_queue {
 };
 
 struct ibmvfc_async_crq {
-	u8 valid;
+	volatile u8 valid;
 	u8 pad[3];
 	u32 pad2;
-	u64 event;
-	u64 scsi_id;
-	u64 wwpn;
-	u64 node_name;
+	volatile u64 event;
+	volatile u64 scsi_id;
+	volatile u64 wwpn;
+	volatile u64 node_name;
 	u64 reserved;
 }__attribute__((packed, aligned (8)));