aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-09-26 08:52:09 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-09-26 08:52:09 +0000
commit7cae3c4f8a20ef5a3c62ddcd8563a0dcd4160fb0 (patch)
tree95b31c79332821e8b6382d42f655323bfd1acabe
parent25fadf0b072ea93bbe18fe51767f40c378e267b4 (diff)
downloadupstream-7cae3c4f8a20ef5a3c62ddcd8563a0dcd4160fb0.tar.gz
upstream-7cae3c4f8a20ef5a3c62ddcd8563a0dcd4160fb0.tar.bz2
upstream-7cae3c4f8a20ef5a3c62ddcd8563a0dcd4160fb0.zip
fix 2.6.31 compile with union mounts disabled
SVN-Revision: 17730
-rw-r--r--target/linux/generic-2.6/patches-2.6.31/230-union_mounts.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.31/232-union_mounts_compile_fix.patch11
2 files changed, 13 insertions, 2 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.31/230-union_mounts.patch b/target/linux/generic-2.6/patches-2.6.31/230-union_mounts.patch
index d1b6b93e32..836742295a 100644
--- a/target/linux/generic-2.6/patches-2.6.31/230-union_mounts.patch
+++ b/target/linux/generic-2.6/patches-2.6.31/230-union_mounts.patch
@@ -4901,8 +4901,8 @@
+#define IS_MNT_UNION(x) (0)
+#define is_unionized(x, y) (0)
+#define append_to_union(x1, y1, x2, y2) ({ BUG(); (0); })
-+#define follow_union_down(x, y) ({ (0); })
-+#define follow_union_mount(x, y) ({ (0); })
++#define follow_union_down(x) ({ (0); })
++#define follow_union_mount(x) ({ (0); })
+#define __d_drop_unions(x) do { } while (0)
+#define shrink_d_unions(x) do { } while (0)
+#define __shrink_d_unions(x,y) do { } while (0)
diff --git a/target/linux/generic-2.6/patches-2.6.31/232-union_mounts_compile_fix.patch b/target/linux/generic-2.6/patches-2.6.31/232-union_mounts_compile_fix.patch
new file mode 100644
index 0000000000..bf922a3b8d
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.31/232-union_mounts_compile_fix.patch
@@ -0,0 +1,11 @@
+--- a/include/linux/union.h
++++ b/include/linux/union.h
+@@ -77,7 +77,7 @@
+ #define __union_copyup(x, y, z) ({ BUG(); (0); })
+ #define union_copyup(x, y) ({ (0); })
+ #define union_copyup_dir(x) ({ BUG(); (0); })
+-#define union_permission(x, y) inode_permission(x->dentry->d_inode, y)
++#define union_permission(x, y) inode_permission((x)->dentry->d_inode, y)
+
+ #endif /* CONFIG_UNION_MOUNT */
+ #endif /* __KERNEL__ */