From patchwork Thu Mar 29 08:42:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 149376 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 5F9C8B6F6E for ; Thu, 29 Mar 2012 19:47:40 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 85096A0327; Thu, 29 Mar 2012 08:47:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NXTnYDv4UEtr; Thu, 29 Mar 2012 08:47:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 5ACC0A004E; Thu, 29 Mar 2012 08:47:36 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id A29D88F753 for ; Thu, 29 Mar 2012 08:47:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 98C8226AF4 for ; Thu, 29 Mar 2012 08:47:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GsdwG0q3eMHF for ; Thu, 29 Mar 2012 08:47:34 +0000 (UTC) Received: from busybox.osuosl.org (busybox.osuosl.org [140.211.167.224]) by silver.osuosl.org (Postfix) with ESMTP id 0785F2066B for ; Thu, 29 Mar 2012 08:47:34 +0000 (UTC) Received: by busybox.osuosl.org (Postfix, from userid 4021) id E5C69969A7; Thu, 29 Mar 2012 08:47:33 +0000 (UTC) From: Peter Korsgaard To: buildroot@busybox.net Date: Thu, 29 Mar 2012 10:42:24 +0200 X-Git-Refname: refs/heads/master X-Git-Oldrev: d0e5eb281f0e3b323ecb3446c1b16baf7f3baa69 X-Git-Newrev: a3daa6f785285ee2354a55b55189930f18eb36a8 X-Patchwork-Hint: ignore Message-Id: <20120329084733.E5C69969A7@busybox.osuosl.org> Subject: [Buildroot] [git commit] Fix problem with undefined umode_t type in 3.3 kernel headers X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net commit: http://git.buildroot.net/buildroot/commit/?id=a3daa6f785285ee2354a55b55189930f18eb36a8 branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master The 3.3 kernel headers define the umode_t type within a __KERNEL__ preprocessor ifdef region. This results in a broken kernel header in the buildroot toolchain. [Peter: This is discussed upstream here: https://bugzilla.kernel.org/show_bug.cgi?id=42986 Long term socat/syslinux should stop using this header, but this hasn't been fixed upstream yet] Signed-off-by: Simon Dawson Signed-off-by: Peter Korsgaard --- .../kernel-headers/linux-3.3-fix-umode_t.patch | 22 ++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/toolchain/kernel-headers/linux-3.3-fix-umode_t.patch b/toolchain/kernel-headers/linux-3.3-fix-umode_t.patch new file mode 100644 index 0000000..9663662 --- /dev/null +++ b/toolchain/kernel-headers/linux-3.3-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;