From f7f0d137c581ffed2c8d8424faf290812f7fac65 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sun, 13 May 2012 01:25:12 +0000 Subject: kernel-headers: bump 3.{2, 3}.x stable versions Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- toolchain/kernel-headers/Config.in | 4 ++-- .../kernel-headers/linux-3.3.5-fix-umode_t.patch | 22 ---------------------- .../kernel-headers/linux-3.3.6-fix-umode_t.patch | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 toolchain/kernel-headers/linux-3.3.5-fix-umode_t.patch create mode 100644 toolchain/kernel-headers/linux-3.3.6-fix-umode_t.patch (limited to 'toolchain') diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in index 36370b42a..d8602f1dd 100644 --- a/toolchain/kernel-headers/Config.in +++ b/toolchain/kernel-headers/Config.in @@ -65,7 +65,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "2.6.39.4" if BR2_KERNEL_HEADERS_2_6_39 default "3.0.31" if BR2_KERNEL_HEADERS_3_0 default "3.1.10" if BR2_KERNEL_HEADERS_3_1 - default "3.2.16" if BR2_KERNEL_HEADERS_3_2 - default "3.3.5" if BR2_KERNEL_HEADERS_3_3 + default "3.2.17" if BR2_KERNEL_HEADERS_3_2 + default "3.3.6" if BR2_KERNEL_HEADERS_3_3 default "2.6" if BR2_KERNEL_HEADERS_SNAP default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION diff --git a/toolchain/kernel-headers/linux-3.3.5-fix-umode_t.patch b/toolchain/kernel-headers/linux-3.3.5-fix-umode_t.patch deleted file mode 100644 index 966366225..000000000 --- a/toolchain/kernel-headers/linux-3.3.5-fix-umode_t.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix a problem with the 3.3 kernel headers. Specifically, the umode_t type -is defined within a __KERNEL__ preprocessor ifdef region, and so the type -is not usable by non-kernel code. Visit the following URL for more details. - -* http://www.spinics.net/lists/linux-fsdevel/msg52638.html - -The commit that created the problem can be seen at the following URL. - -* http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=commitdiff;h=0583fcc96bb117763c0fa74c123573c0112dec65 - -diff -Nur a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h ---- a/include/linux/ext2_fs.h 2012-03-18 23:15:34.000000000 +0000 -+++ b/include/linux/ext2_fs.h 2012-03-21 11:47:53.015548437 +0000 -@@ -209,7 +209,7 @@ - #define EXT2_OTHER_FLMASK (EXT2_NODUMP_FL | EXT2_NOATIME_FL) - - /* Mask out flags that are inappropriate for the given type of inode. */ --static inline __u32 ext2_mask_flags(umode_t mode, __u32 flags) -+static inline __u32 ext2_mask_flags(unsigned short mode, __u32 flags) - { - if (S_ISDIR(mode)) - return flags; diff --git a/toolchain/kernel-headers/linux-3.3.6-fix-umode_t.patch b/toolchain/kernel-headers/linux-3.3.6-fix-umode_t.patch new file mode 100644 index 000000000..966366225 --- /dev/null +++ b/toolchain/kernel-headers/linux-3.3.6-fix-umode_t.patch @@ -0,0 +1,22 @@ +Fix a problem with the 3.3 kernel headers. Specifically, the umode_t type +is defined within a __KERNEL__ preprocessor ifdef region, and so the type +is not usable by non-kernel code. Visit the following URL for more details. + +* http://www.spinics.net/lists/linux-fsdevel/msg52638.html + +The commit that created the problem can be seen at the following URL. + +* http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=commitdiff;h=0583fcc96bb117763c0fa74c123573c0112dec65 + +diff -Nur a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h +--- a/include/linux/ext2_fs.h 2012-03-18 23:15:34.000000000 +0000 ++++ b/include/linux/ext2_fs.h 2012-03-21 11:47:53.015548437 +0000 +@@ -209,7 +209,7 @@ + #define EXT2_OTHER_FLMASK (EXT2_NODUMP_FL | EXT2_NOATIME_FL) + + /* Mask out flags that are inappropriate for the given type of inode. */ +-static inline __u32 ext2_mask_flags(umode_t mode, __u32 flags) ++static inline __u32 ext2_mask_flags(unsigned short mode, __u32 flags) + { + if (S_ISDIR(mode)) + return flags; -- cgit v1.2.3