Commit 1596e926 authored by Natanael Copa's avatar Natanael Copa

main/linux-headers: fix issues with transition of scsi.h

parent 3c938144
......@@ -2,7 +2,7 @@
pkgname=linux-headers
pkgver=2.6.32.2
_kernver=2.6.32
pkgrel=0
pkgrel=1
pkgdesc="Linux system headers"
url="http://kernel.org"
license='GPL-2'
......@@ -11,6 +11,7 @@ replaces="uclibc-dev"
options="!strip !tracedeps"
source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
scsi.patch
"
build() {
......@@ -18,6 +19,7 @@ build() {
if [ "$_kernver" != "$pkgver" ]; then
bunzip2 -c < ../patch-$pkgver.bz2 | patch -p1 || return 1
fi
patch -p1 -i "$srcdir"/scsi.patch || return 1
mkdir -p "$pkgdir/usr"
make headers_install INSTALL_HDR_PATH="$pkgdir/usr"
......@@ -30,4 +32,5 @@ build() {
}
md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2
924b7aa0fcd6e54c12ecc9b3c3082f59 patch-2.6.32.2.bz2"
924b7aa0fcd6e54c12ecc9b3c3082f59 patch-2.6.32.2.bz2
b6d05566fcfe07770d9386f0588f8758 scsi.patch"
diff -Naur linux-2.6.32-old/include/scsi/scsi.h linux-2.6.32/include/scsi/scsi.h
--- linux-2.6.32-old/include/scsi/scsi.h 2009-12-03 13:51:21.000000000 +1000
+++ linux-2.6.32/include/scsi/scsi.h 2009-12-12 10:43:11.000000000 +1000
@@ -145,14 +145,15 @@
/* 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 */
};
+#ifdef __KERNEL__
static inline unsigned
scsi_varlen_cdb_length(const void *hdr)
{
@@ -168,6 +169,7 @@
return (cmnd[0] == VARIABLE_LENGTH_CMD) ?
scsi_varlen_cdb_length(cmnd) : COMMAND_SIZE(cmnd[0]);
}
+#endif
/*
* SCSI Architecture Model (SAM) Status codes. Taken from SAM-3 draft
@@ -284,8 +286,10 @@
SCSI_PROTOCOL_UNSPEC = 0xf, /* No specific protocol */
};
+#ifdef __KERNEL__
/* Returns a human-readable name for the device */
extern const char * scsi_device_type(unsigned type);
+#endif
/*
* standard mode-select header prepended to all mode-select commands
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment