aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-01-31 09:44:00 +0000
committerJonas Gorski <jogo@openwrt.org>2012-01-31 09:44:00 +0000
commitb3568b10c227e933f11b620e43a7a21f5019bf78 (patch)
tree91014e80dc8cb6ab09cd6fa4ea40143fd1640969 /target/linux/generic
parent1015fab0d7d64107be4dd6c798b88bff357575cb (diff)
downloadupstream-b3568b10c227e933f11b620e43a7a21f5019bf78.tar.gz
upstream-b3568b10c227e933f11b620e43a7a21f5019bf78.tar.bz2
upstream-b3568b10c227e933f11b620e43a7a21f5019bf78.zip
kernel: update linux 3.2 to 3.2.2
SVN-Revision: 29967
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-3.2/950-vm_exports.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.2/950-vm_exports.patch b/target/linux/generic/patches-3.2/950-vm_exports.patch
index 27ce7641f1..355ecba8ec 100644
--- a/target/linux/generic/patches-3.2/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.2/950-vm_exports.patch
@@ -1,6 +1,6 @@
--- a/mm/shmem.c
+++ b/mm/shmem.c
-@@ -2462,6 +2462,16 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range);
+@@ -2491,6 +2491,16 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range);
/* common code */
@@ -17,7 +17,7 @@
/**
* shmem_file_setup - get an unlinked file living in tmpfs
* @name: name for dentry (to be seen in /proc/<pid>/maps
-@@ -2539,11 +2549,8 @@ int shmem_zero_setup(struct vm_area_stru
+@@ -2568,11 +2578,8 @@ int shmem_zero_setup(struct vm_area_stru
if (IS_ERR(file))
return PTR_ERR(file);