aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.1/100-overlayfs_v11.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-01-13 14:38:28 +0000
committerJonas Gorski <jogo@openwrt.org>2012-01-13 14:38:28 +0000
commit348b4546eba444c6fdfa2dd710621291f0342cb6 (patch)
treee5cb11e1cd143af6f6e6d04cbfe2ee8699505789 /target/linux/generic/patches-3.1/100-overlayfs_v11.patch
parentb2e991c3b2f439c9fb76ba214046b71f75b63795 (diff)
downloadmaster-187ad058-348b4546eba444c6fdfa2dd710621291f0342cb6.tar.gz
master-187ad058-348b4546eba444c6fdfa2dd710621291f0342cb6.tar.bz2
master-187ad058-348b4546eba444c6fdfa2dd710621291f0342cb6.zip
kernel: update linux 3.1 to 3.1.9
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29726 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.1/100-overlayfs_v11.patch')
-rw-r--r--target/linux/generic/patches-3.1/100-overlayfs_v11.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.1/100-overlayfs_v11.patch b/target/linux/generic/patches-3.1/100-overlayfs_v11.patch
index 9870000d3b..f995a56030 100644
--- a/target/linux/generic/patches-3.1/100-overlayfs_v11.patch
+++ b/target/linux/generic/patches-3.1/100-overlayfs_v11.patch
@@ -254,7 +254,7 @@
rc = PTR_ERR(inode);
--- a/fs/namespace.c
+++ b/fs/namespace.c
-@@ -1495,6 +1495,23 @@ void drop_collected_mounts(struct vfsmou
+@@ -1492,6 +1492,23 @@ void drop_collected_mounts(struct vfsmou
release_mounts(&umount_list);
}
@@ -3154,7 +3154,7 @@
} ____cacheline_aligned;
struct seq_file;
-@@ -2022,6 +2034,7 @@ extern long do_sys_open(int dfd, const c
+@@ -2023,6 +2035,7 @@ extern long do_sys_open(int dfd, const c
extern struct file *filp_open(const char *, int, int);
extern struct file *file_open_root(struct dentry *, struct vfsmount *,
const char *, int);