| From 877aa0313e7d22b88d04ebef76392e1688fffff9 Mon Sep 17 00:00:00 2001 |
| From: Peter Korsgaard <jacmet@sunsite.dk> |
| Date: Fri, 27 Nov 2009 11:20:54 +0100 |
| Subject: [PATCH] scsi: use __uX types for headers exported to user space |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| Commit 9e4f5e29 (FC Pass Thru support) exported a number of header files |
| in include/scsi to user space, but didn't change the uX types to the |
| userspace-compatible __uX types. Without that you'll get compile errors |
| when including them - E.G.: |
| |
| /tmp/include/scsi/scsi.h:145: error: expected specifier-qualifier-list |
| before ‘u8’ |
| |
| Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> |
| --- |
| include/scsi/scsi.h | 8 ++++---- |
| include/scsi/scsi_netlink.h | 4 ++-- |
| 2 files changed, 6 insertions(+), 6 deletions(-) |
| |
| diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h |
| index 8b4deca..ec3053e 100644 |
| --- a/include/scsi/scsi.h |
| +++ b/include/scsi/scsi.h |
| @@ -149,10 +149,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/include/scsi/scsi_netlink.h b/include/scsi/scsi_netlink.h |
| index 536752c..58ce8fe 100644 |
| --- a/include/scsi/scsi_netlink.h |
| +++ b/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) |
| |
| |
| -- |
| 1.7.0 |
| |
