diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-09-15 16:00:41 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-09-15 16:00:41 +0000 |
| commit | bd758645eb70c1b9d3f52878eaaf2f901342e7fd (patch) | |
| tree | d4d295fb2cbe10aa39502d39d7094bc7149e2990 /target/linux/generic/patches-3.10/411-mtd-partial_eraseblock_write.patch | |
| parent | 0f116fdd09b19d53b243c1232b8507ae35398f4f (diff) | |
kernel: update 3.10 to 3.10.12
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38000 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.10/411-mtd-partial_eraseblock_write.patch')
| -rw-r--r-- | target/linux/generic/patches-3.10/411-mtd-partial_eraseblock_write.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.10/411-mtd-partial_eraseblock_write.patch b/target/linux/generic/patches-3.10/411-mtd-partial_eraseblock_write.patch index fbc2d5f0e1..07db137061 100644 --- a/target/linux/generic/patches-3.10/411-mtd-partial_eraseblock_write.patch +++ b/target/linux/generic/patches-3.10/411-mtd-partial_eraseblock_write.patch @@ -9,7 +9,7 @@ /* Our partition linked list */ static LIST_HEAD(mtd_partitions); static DEFINE_MUTEX(mtd_partitions_mutex); -@@ -232,13 +234,60 @@ static int part_erase(struct mtd_info *m +@@ -231,13 +233,60 @@ static int part_erase(struct mtd_info *m struct mtd_part *part = PART(mtd); int ret; @@ -70,7 +70,7 @@ return ret; } -@@ -246,7 +295,25 @@ void mtd_erase_callback(struct erase_inf +@@ -245,7 +294,25 @@ void mtd_erase_callback(struct erase_inf { if (instr->mtd->_erase == part_erase) { struct mtd_part *part = PART(instr->mtd); @@ -96,7 +96,7 @@ if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN) instr->fail_addr -= part->offset; instr->addr -= part->offset; -@@ -506,18 +573,24 @@ static struct mtd_part *allocate_partiti +@@ -505,18 +572,24 @@ static struct mtd_part *allocate_partiti if ((slave->mtd.flags & MTD_WRITEABLE) && mtd_mod_by_eb(slave->offset, &slave->mtd)) { /* Doesn't start on a boundary of major erase size */ |