aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.31/232-union_mounts_compile_fix.patch
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 /target/linux/generic-2.6/patches-2.6.31/232-union_mounts_compile_fix.patch
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
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.31/232-union_mounts_compile_fix.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.31/232-union_mounts_compile_fix.patch11
1 files changed, 11 insertions, 0 deletions
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__ */