From edb15260e9b15d9944804dfa5ef70b94abefc44f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 2 Oct 2010 14:35:53 +0200 Subject: kernel-headers: bump 2.6.32.x stable version Signed-off-by: Peter Korsgaard --- toolchain/kernel-headers/Config.in | 2 +- ...-types-for-headers-exported-to-user-space.patch | 60 ---------------------- ...-types-for-headers-exported-to-user-space.patch | 60 ++++++++++++++++++++++ 3 files changed, 61 insertions(+), 61 deletions(-) delete mode 100644 toolchain/kernel-headers/linux-2.6.32.23-scsi-use-__uX-types-for-headers-exported-to-user-space.patch create mode 100644 toolchain/kernel-headers/linux-2.6.32.24-scsi-use-__uX-types-for-headers-exported-to-user-space.patch diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in index bfe6afbbb..fa795781c 100644 --- a/toolchain/kernel-headers/Config.in +++ b/toolchain/kernel-headers/Config.in @@ -60,7 +60,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "2.6.29.6" if BR2_KERNEL_HEADERS_2_6_29 default "2.6.30.10" if BR2_KERNEL_HEADERS_2_6_30 default "2.6.31.14" if BR2_KERNEL_HEADERS_2_6_31 - default "2.6.32.23" if BR2_KERNEL_HEADERS_2_6_32 + default "2.6.32.24" if BR2_KERNEL_HEADERS_2_6_32 default "2.6.33.7" if BR2_KERNEL_HEADERS_2_6_33 default "2.6.34.7" if BR2_KERNEL_HEADERS_2_6_34 default "2.6.35.6" if BR2_KERNEL_HEADERS_2_6_35 diff --git a/toolchain/kernel-headers/linux-2.6.32.23-scsi-use-__uX-types-for-headers-exported-to-user-space.patch b/toolchain/kernel-headers/linux-2.6.32.23-scsi-use-__uX-types-for-headers-exported-to-user-space.patch deleted file mode 100644 index 2fc6176e8..000000000 --- a/toolchain/kernel-headers/linux-2.6.32.23-scsi-use-__uX-types-for-headers-exported-to-user-space.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 5e0675efcec309617ba2d334c68ddb250ef942b2 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -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 ---- - include/scsi/scsi.h | 8 ++++---- - include/scsi/scsi_netlink.h | 20 ++++++++++---------- - 2 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h -index 34c46ab..b3cffec 100644 ---- a/include/scsi/scsi.h -+++ b/include/scsi/scsi.h -@@ -145,10 +145,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..7445c46 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.6.5 - diff --git a/toolchain/kernel-headers/linux-2.6.32.24-scsi-use-__uX-types-for-headers-exported-to-user-space.patch b/toolchain/kernel-headers/linux-2.6.32.24-scsi-use-__uX-types-for-headers-exported-to-user-space.patch new file mode 100644 index 000000000..2fc6176e8 --- /dev/null +++ b/toolchain/kernel-headers/linux-2.6.32.24-scsi-use-__uX-types-for-headers-exported-to-user-space.patch @@ -0,0 +1,60 @@ +From 5e0675efcec309617ba2d334c68ddb250ef942b2 Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard +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 +--- + include/scsi/scsi.h | 8 ++++---- + include/scsi/scsi_netlink.h | 20 ++++++++++---------- + 2 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h +index 34c46ab..b3cffec 100644 +--- a/include/scsi/scsi.h ++++ b/include/scsi/scsi.h +@@ -145,10 +145,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..7445c46 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.6.5 + -- cgit v1.2.3