Commit 7e7fce1b authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

linux/kernel-headers: bump 2.6.32.x / 2.6.35.x stable versions 



And add missing 2.6.35 patch.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent aefad531

linux/Config.in

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ choice 
	default BR2_LINUX_KERNEL_2_6_35



config BR2_LINUX_KERNEL_2_6_35

	bool "2.6.35.5"

	bool "2.6.35.6"



config BR2_LINUX_KERNEL_SAME_AS_HEADERS

	bool "Same as toolchain kernel headers"
@@ -52,7 +52,7 @@ endchoice 
config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE

	string "Kernel version"

	depends on BR2_LINUX_KERNEL_CUSTOM_VERSION

	default "2.6.35.5"

	default "2.6.35.6"



config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION

	string "URL of custom kernel tarball"
@@ -60,7 +60,7 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION 


config BR2_LINUX_KERNEL_VERSION

	string

	default "2.6.35.5" if BR2_LINUX_KERNEL_2_6_35

	default "2.6.35.6" if BR2_LINUX_KERNEL_2_6_35

	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS

	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION

	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

toolchain/kernel-headers/Config.in

+2 −2
Original line number Diff line number Diff line
@@ -60,9 +60,9 @@ 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.22"	if BR2_KERNEL_HEADERS_2_6_32

	default "2.6.32.23"	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.5"	if BR2_KERNEL_HEADERS_2_6_35

	default "2.6.35.6"	if BR2_KERNEL_HEADERS_2_6_35

	default "2.6"		if BR2_KERNEL_HEADERS_SNAP

	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

toolchain/kernel-headers/linux-2.6.32.22-scsi-use-__uX-types-for-headers-exported-to-user-space.patch→toolchain/kernel-headers/linux-2.6.32.23-scsi-use-__uX-types-for-headers-exported-to-user-space.patch

+0 −0

File moved.

View file

toolchain/kernel-headers/linux-2.6.35.6-scsi-use-__uX-types-for-headers-exported-to-user-space.patch

0 → 100644
+59 −0
Original line number Diff line number Diff line 
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