[PATCH] SCSI: userspace cannot use scsi_command_size_tbl,COMMAND_SIZE and scsi_device_type
From: Jaswinder Singh Rajput
Date: Sat Jun 27 2009 - 13:06:33 EST
userspace cannot use scsi_command_size_tbl, COMMAND_SIZE
and scsi_device_type defined in kernel
fix the following 'make headers_check' warnings:
usr/include/scsi/scsi.h:159: userspace cannot call function or variable defined in the kernel
usr/include/scsi/scsi.h:285: userspace cannot call function or variable defined in the kernel
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@xxxxxxxxx>
---
include/scsi/scsi.h | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index 084478e..7ba5acf 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -156,9 +156,6 @@ scsi_varlen_cdb_length(const void *hdr)
return ((struct scsi_varlen_cdb_hdr *)hdr)->additional_cdb_length + 8;
}
-extern const unsigned char scsi_command_size_tbl[8];
-#define COMMAND_SIZE(opcode) scsi_command_size_tbl[((opcode) >> 5) & 7]
-
static inline unsigned
scsi_command_size(const unsigned char *cmnd)
{
@@ -166,6 +163,13 @@ scsi_command_size(const unsigned char *cmnd)
scsi_varlen_cdb_length(cmnd) : COMMAND_SIZE(cmnd[0]);
}
+#ifdef __KERNEL__
+extern const unsigned char scsi_command_size_tbl[8];
+#define COMMAND_SIZE(opcode) scsi_command_size_tbl[((opcode) >> 5) & 7]
+
+/* Returns a human-readable name for the device */
+extern const char * scsi_device_type(unsigned type);
+#endif
/*
* SCSI Architecture Model (SAM) Status codes. Taken from SAM-3 draft
* T10/1561-D Revision 4 Draft dated 7th November 2002.
@@ -281,9 +285,6 @@ enum scsi_protocol {
SCSI_PROTOCOL_UNSPEC = 0xf, /* No specific protocol */
};
-/* Returns a human-readable name for the device */
-extern const char * scsi_device_type(unsigned type);
-
/*
* standard mode-select header prepended to all mode-select commands
*/
--
1.6.0.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/