aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-03-03 13:57:40 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-03-03 13:57:40 +0000
commit23b3b3a194bc56307bfb2f371612e0b5ef881b98 (patch)
treed65a523d9a6df4858bc88b1aaffe235150fcfc59 /target/linux/generic
parentb58bd6e8811f3db0fb254e25a4c886c9e48c80c7 (diff)
downloadupstream-23b3b3a194bc56307bfb2f371612e0b5ef881b98.tar.gz
upstream-23b3b3a194bc56307bfb2f371612e0b5ef881b98.tar.bz2
upstream-23b3b3a194bc56307bfb2f371612e0b5ef881b98.zip
kernel: update linux 3.7 to 3.7.10
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 35860
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-3.7/950-vm_exports.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.7/950-vm_exports.patch b/target/linux/generic/patches-3.7/950-vm_exports.patch
index 85126e4d60..d72f132d63 100644
--- a/target/linux/generic/patches-3.7/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.7/950-vm_exports.patch
@@ -1,6 +1,6 @@
--- a/mm/shmem.c
+++ b/mm/shmem.c
-@@ -2775,6 +2775,15 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range);
+@@ -2781,6 +2781,15 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range);
/* common code */
@@ -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
-@@ -2851,11 +2860,8 @@ int shmem_zero_setup(struct vm_area_stru
+@@ -2857,11 +2866,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);