summaryrefslogtreecommitdiffstats
path: root/toolchain
diff options
context:
space:
mode:
authorcshore <cshore@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-05-13 05:02:27 +0000
committercshore <cshore@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-05-13 05:02:27 +0000
commit9f4775aa7200cc5e241db6a748cec9f9641e2f06 (patch)
treedcc15f751275a9860fbd95d2a67a2cb21e82b50b /toolchain
parent0b98ffdc6a0c447d7da4910cec9fdb14f22faf18 (diff)
[toolchain] kernel-headers: Fix patch application for kernel-headers and a patch that fixes exposure of a kernel-only data type (umode_t) to application layer which causes compile errors in ext2_fs.h using programs.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31697 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/kernel-headers/Makefile2
-rw-r--r--toolchain/kernel-headers/patches-3.3.5/100-ext2_fs_header.patch24
2 files changed, 25 insertions, 1 deletions
diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index b5aaa83c4..ca8a78ff1 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -22,7 +22,7 @@ HOST_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
PKG_MD5SUM:=$(LINUX_KERNEL_MD5SUM)
LINUX_DIR := $(HOST_BUILD_DIR)
FILES_DIR :=
-PATCH_DIR := ./patches$(if $(wildcard ./patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
+PATCH_DIR := ./patches$(if $(wildcard ./patches-$(LINUX_VERSION)),-$(LINUX_VERSION))
include $(INCLUDE_DIR)/toolchain-build.mk
include $(INCLUDE_DIR)/kernel-defaults.mk
diff --git a/toolchain/kernel-headers/patches-3.3.5/100-ext2_fs_header.patch b/toolchain/kernel-headers/patches-3.3.5/100-ext2_fs_header.patch
new file mode 100644
index 000000000..1bd9c9d54
--- /dev/null
+++ b/toolchain/kernel-headers/patches-3.3.5/100-ext2_fs_header.patch
@@ -0,0 +1,24 @@
+Index: linux-3.3.5/include/linux/ext2_fs.h
+===================================================================
+--- linux-3.3.5.orig/include/linux/ext2_fs.h 2012-05-12 05:49:43.555033434 -0400
++++ linux-3.3.5/include/linux/ext2_fs.h 2012-05-12 05:51:01.895033564 -0400
+@@ -209,7 +209,11 @@
+ #define EXT2_OTHER_FLMASK (EXT2_NODUMP_FL | EXT2_NOATIME_FL)
+
+ /* Mask out flags that are inappropriate for the given type of inode. */
++#ifdef __KERNEL__
+ static inline __u32 ext2_mask_flags(umode_t mode, __u32 flags)
++#else
++static inline __u32 ext2_mask_flags(unsigned short mode, __u32 flags)
++#endif
+ {
+ if (S_ISDIR(mode))
+ return flags;
+@@ -219,6 +223,7 @@
+ return flags & EXT2_OTHER_FLMASK;
+ }
+
++
+ /*
+ * ioctl commands
+ */