summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.31/232-union_mounts_compile_fix.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-09-26 08:52:09 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-09-26 08:52:09 +0000
commit82bbacf365a65831e9cf70938ce96d732fb97078 (patch)
treef61906f06561a4254c8d11ab2f15726700c71fa8 /target/linux/generic-2.6/patches-2.6.31/232-union_mounts_compile_fix.patch
parent2dee5f79ddda81bd1892224b786d610eae23d16a (diff)
fix 2.6.31 compile with union mounts disabled
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17730 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 000000000..bf922a3b8
--- /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__ */