jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-30 14:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

kernel-headers: add 2.6.34

Browse Source 
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2010-06-01 22:07:48 +02:00
parent 1ccc8eef50
commit 3d5198c19b
2 changed files with 64 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
toolchain/kernel-headers/Config.in
View File

@ -6,7 +6,7 @@ comment "Kernel Header Options"
choice choice
prompt "Kernel Headers" prompt "Kernel Headers"
default BR2_KERNEL_HEADERS_2_6_33 default BR2_KERNEL_HEADERS_2_6_34
help help
Select the version of kernel header files you wish to use. Select the version of kernel header files you wish to use.
@ -42,6 +42,9 @@ choice
config BR2_KERNEL_HEADERS_2_6_33 config BR2_KERNEL_HEADERS_2_6_33
bool "Linux 2.6.33.x kernel headers" bool "Linux 2.6.33.x kernel headers"
config BR2_KERNEL_HEADERS_2_6_34
bool "Linux 2.6.34.x kernel headers"
config BR2_KERNEL_HEADERS_VERSION config BR2_KERNEL_HEADERS_VERSION
bool "Linux 2.6 (manually specified version)" bool "Linux 2.6 (manually specified version)"
@ -65,5 +68,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "2.6.31.13" if BR2_KERNEL_HEADERS_2_6_31 default "2.6.31.13" if BR2_KERNEL_HEADERS_2_6_31
default "2.6.32.15" if BR2_KERNEL_HEADERS_2_6_32 default "2.6.32.15" if BR2_KERNEL_HEADERS_2_6_32
default "2.6.33.5" if BR2_KERNEL_HEADERS_2_6_33 default "2.6.33.5" if BR2_KERNEL_HEADERS_2_6_33
default "2.6.34" if BR2_KERNEL_HEADERS_2_6_34
default "2.6" if BR2_KERNEL_HEADERS_SNAP default "2.6" if BR2_KERNEL_HEADERS_SNAP
default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

59
toolchain/kernel-headers/linux-2.6.34-scsi-use-__uX-types-for-headers-exported-to-user-space.patch Normal file
View File

@ -0,0 +1,59 @@
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