diff options
| author | Florian Fainelli <florian@openwrt.org> | 2011-06-04 13:35:55 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2011-06-04 13:35:55 +0000 |
| commit | c8baad652d1f32a71d6b25892665ded30b33f748 (patch) | |
| tree | 3350e421172690b9f7c942effd46a963e6cb1f3e /target/linux/generic | |
| parent | 51fb87ec2fffc5fa47da0d223fb700fefad03e16 (diff) | |
| download | upstream-c8baad652d1f32a71d6b25892665ded30b33f748.tar.gz upstream-c8baad652d1f32a71d6b25892665ded30b33f748.tar.bz2 upstream-c8baad652d1f32a71d6b25892665ded30b33f748.zip | |
[kernel] update to 2.6.39.1
patch from Peter Wagner
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27104 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
| -rw-r--r-- | target/linux/generic/patches-2.6.39/474-mtd_concat_sync_fix.patch | 2 | ||||
| -rw-r--r-- | target/linux/generic/patches-2.6.39/950-vm_exports.patch | 4 |
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 4e3426b7bd..ff3759e220 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 874b810415..26b2da93ac 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); |