From e9dbdc0b497d28ccdc7254defc0f25836c678939 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 10 Aug 2010 18:01:24 -0700 Subject: [PATCH] --- yaml --- r: 208411 b: refs/heads/master c: 083c8c1e60e5c27a277e87dbeb6b89b47937559f h: refs/heads/master i: 208409: 8bfbcf335f6286fae9b701a4d95d578de7d54fb3 208407: ec836bc5057af11d9cc46b351e3743a24e18a36a v: v3 --- [refs] | 2 +- trunk/include/scsi/scsi.h | 8 ++++---- trunk/include/scsi/scsi_netlink.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 409585065acf..737d4b84ccf2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6de61f9d2491970a204da9111e2d25e0d9f284d6 +refs/heads/master: 083c8c1e60e5c27a277e87dbeb6b89b47937559f diff --git a/trunk/include/scsi/scsi.h b/trunk/include/scsi/scsi.h index 9ae5c613131b..8fcb6e0e9e72 100644 --- a/trunk/include/scsi/scsi.h +++ b/trunk/include/scsi/scsi.h @@ -151,10 +151,10 @@ struct scsi_cmnd; /* defined in T10 SCSI Primary Commands-2 (SPC2) */ struct scsi_varlen_cdb_hdr { - u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */ - u8 control; - u8 misc[5]; - u8 additional_cdb_length; /* total cdb length - 8 */ + __u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */ + __u8 control; + __u8 misc[5]; + __u8 additional_cdb_length; /* total cdb length - 8 */ __be16 service_action; /* service specific data follows */ }; diff --git a/trunk/include/scsi/scsi_netlink.h b/trunk/include/scsi/scsi_netlink.h index 536752c40d41..58ce8fe44783 100644 --- a/trunk/include/scsi/scsi_netlink.h +++ b/trunk/include/scsi/scsi_netlink.h @@ -105,8 +105,8 @@ struct scsi_nl_host_vendor_msg { * PCI : ID data is the 16 bit PCI Registered Vendor ID */ #define SCSI_NL_VID_TYPE_SHIFT 56 -#define SCSI_NL_VID_TYPE_MASK ((u64)0xFF << SCSI_NL_VID_TYPE_SHIFT) -#define SCSI_NL_VID_TYPE_PCI ((u64)0x01 << SCSI_NL_VID_TYPE_SHIFT) +#define SCSI_NL_VID_TYPE_MASK ((__u64)0xFF << SCSI_NL_VID_TYPE_SHIFT) +#define SCSI_NL_VID_TYPE_PCI ((__u64)0x01 << SCSI_NL_VID_TYPE_SHIFT) #define SCSI_NL_VID_ID_MASK (~ SCSI_NL_VID_TYPE_MASK)