aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.10/950-vm_exports.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-10-24 20:39:36 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-10-24 20:39:36 +0000
commit951113224ea6b34413c62aaee700437b55105b14 (patch)
tree0be68d8418752f584e77c1f034904a46bc24f185 /target/linux/generic/patches-3.10/950-vm_exports.patch
parent6ba296a1c9439ca825180e078d1190b2149547cc (diff)
downloadmaster-187ad058-951113224ea6b34413c62aaee700437b55105b14.tar.gz
master-187ad058-951113224ea6b34413c62aaee700437b55105b14.tar.bz2
master-187ad058-951113224ea6b34413c62aaee700437b55105b14.zip
kernel: refresh generic 3.10 patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43050 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 faf58660e6..2a08ee35a4 100644
--- a/target/linux/generic/patches-3.10/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.10/950-vm_exports.patch
@@ -1,6 +1,6 @@
--- a/mm/shmem.c
+++ b/mm/shmem.c
-@@ -2883,6 +2883,15 @@ static struct dentry_operations anon_ops
+@@ -2965,6 +2965,15 @@ static struct dentry_operations anon_ops
.d_dname = simple_dname
};
@@ -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
-@@ -2956,11 +2965,8 @@ int shmem_zero_setup(struct vm_area_stru
+@@ -3038,11 +3047,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);
@@ -41,7 +41,7 @@
{
--- a/kernel/exit.c
+++ b/kernel/exit.c
-@@ -501,6 +501,8 @@ static void exit_mm(struct task_struct *
+@@ -502,6 +502,8 @@ static void exit_mm(struct task_struct *
mm_update_next_owner(mm);
mmput(mm);
}