kernel-headers: bump 3.{2, 3}.x stable versions
authorGustavo Zacarias <gustavo@zacarias.com.ar>
Sun, 13 May 2012 01:25:12 +0000 (01:25 +0000)
committerPeter Korsgaard <jacmet@sunsite.dk>
Mon, 14 May 2012 19:19:27 +0000 (21:19 +0200)
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
toolchain/kernel-headers/Config.in
toolchain/kernel-headers/linux-3.3.5-fix-umode_t.patch [deleted file]
toolchain/kernel-headers/linux-3.3.6-fix-umode_t.patch [new file with mode: 0644]

index 36370b42a1a00a34879a4394228a02dee4e66cbe..d8602f1dd485ecfc75ecc05be51fc8b28a1f69ae 100644 (file)
@@ -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 (file)
index 9663662..0000000
+++ /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 (file)
index 0000000..9663662
--- /dev/null
@@ -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;