fix 2.6.31 compile with union mounts disabled

SVN-Revision: 17730

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 d1b6b93e324b02616902337fa3b6fa26aa7e54b1..836742295a53b7fd14f0ed55f85b006951208d3f 100644 (file)
--- 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 (file)
index 0000000..bf922a3
--- /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__ */