aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.10/950-vm_exports.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-10-23 12:51:05 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-10-23 12:51:05 +0000
commit56e1cd4a8e3d806ff92e710c0409165847b2e7af (patch)
treea82433e4101b7b069458cf66d826c4ebd9bbe7c5 /target/linux/generic/patches-3.10/950-vm_exports.patch
parent4805656f76b5ac07882c66bb81bc294d4b441571 (diff)
downloadupstream-56e1cd4a8e3d806ff92e710c0409165847b2e7af.tar.gz
upstream-56e1cd4a8e3d806ff92e710c0409165847b2e7af.tar.bz2
upstream-56e1cd4a8e3d806ff92e710c0409165847b2e7af.zip
kernel: update 3.10 to 3.10.17
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38506 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.10/950-vm_exports.patch')
-rw-r--r--target/linux/generic/patches-3.10/950-vm_exports.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.10/950-vm_exports.patch b/target/linux/generic/patches-3.10/950-vm_exports.patch
index c19c3320af..0ec0623306 100644
--- a/target/linux/generic/patches-3.10/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.10/950-vm_exports.patch
@@ -1,7 +1,7 @@
--- a/mm/shmem.c
+++ b/mm/shmem.c
-@@ -2889,6 +2889,15 @@ static struct dentry_operations anon_ops
- .d_dname = shmem_dname
+@@ -2883,6 +2883,15 @@ static struct dentry_operations anon_ops
+ .d_dname = simple_dname
};
+void shmem_set_file(struct vm_area_struct *vma, struct file *file)
@@ -16,7 +16,7 @@
/**
* shmem_file_setup - get an unlinked file living in tmpfs
* @name: name for dentry (to be seen in /proc/<pid>/maps
-@@ -2962,11 +2971,8 @@ int shmem_zero_setup(struct vm_area_stru
+@@ -2956,11 +2965,8 @@ int shmem_zero_setup(struct vm_area_stru
file = shmem_file_setup("dev/zero", size, vma->vm_flags);
if (IS_ERR(file))
return PTR_ERR(file);