summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-2.6.39
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2011-06-04 13:35:55 +0000
committerFlorian Fainelli <florian@openwrt.org>2011-06-04 13:35:55 +0000
commit763b58c30c60ccc3864e46cf916666766b060f23 (patch)
treed78edd4703568b04a14abcf816ce98cfaa8b8bce /target/linux/generic/patches-2.6.39
parent3715fa33fe61c37e37c7bc49abe59a986938f3e9 (diff)
downloadmtk-20170518-763b58c30c60ccc3864e46cf916666766b060f23.zip
mtk-20170518-763b58c30c60ccc3864e46cf916666766b060f23.tar.gz
mtk-20170518-763b58c30c60ccc3864e46cf916666766b060f23.tar.bz2
update to 2.6.39.1
patch from Peter Wagner SVN-Revision: 27104
Diffstat (limited to 'target/linux/generic/patches-2.6.39')
-rw-r--r--target/linux/generic/patches-2.6.39/474-mtd_concat_sync_fix.patch2
-rw-r--r--target/linux/generic/patches-2.6.39/950-vm_exports.patch4
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-2.6.39/474-mtd_concat_sync_fix.patch b/target/linux/generic/patches-2.6.39/474-mtd_concat_sync_fix.patch
index 4e3426b..ff3759e 100644
--- a/target/linux/generic/patches-2.6.39/474-mtd_concat_sync_fix.patch
+++ b/target/linux/generic/patches-2.6.39/474-mtd_concat_sync_fix.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
-@@ -619,7 +619,8 @@ static void concat_sync(struct mtd_info
+@@ -619,7 +619,8 @@ static void concat_sync(struct mtd_info
for (i = 0; i < concat->num_subdev; i++) {
struct mtd_info *subdev = concat->subdev[i];
diff --git a/target/linux/generic/patches-2.6.39/950-vm_exports.patch b/target/linux/generic/patches-2.6.39/950-vm_exports.patch
index 874b810..26b2da9 100644
--- a/target/linux/generic/patches-2.6.39/950-vm_exports.patch
+++ b/target/linux/generic/patches-2.6.39/950-vm_exports.patch
@@ -1,6 +1,6 @@
--- a/mm/shmem.c
+++ b/mm/shmem.c
-@@ -2730,6 +2730,16 @@ out:
+@@ -2731,6 +2731,16 @@ out:
/* 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
-@@ -2807,10 +2817,7 @@ int shmem_zero_setup(struct vm_area_stru
+@@ -2808,10 +2818,7 @@ int shmem_zero_setup(struct vm_area_stru
if (IS_ERR(file))
return PTR_ERR(file);