diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-07-15 15:12:37 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2013-07-15 15:12:37 +0000 |
commit | 3197479290dbb7d7a081d65d2b64da36698d4408 (patch) | |
tree | c1c36b5131b94038112b79e0038f681b81f8e88c /target/linux/generic/patches-3.10/401-partial_eraseblock_write.patch | |
parent | a6db996b134ba48805bca692b904ef7805711e8c (diff) | |
download | master-31e0f0ae-3197479290dbb7d7a081d65d2b64da36698d4408.tar.gz master-31e0f0ae-3197479290dbb7d7a081d65d2b64da36698d4408.tar.bz2 master-31e0f0ae-3197479290dbb7d7a081d65d2b64da36698d4408.zip |
kernel: refresh 3.10 patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 37348
Diffstat (limited to 'target/linux/generic/patches-3.10/401-partial_eraseblock_write.patch')
-rw-r--r-- | target/linux/generic/patches-3.10/401-partial_eraseblock_write.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.10/401-partial_eraseblock_write.patch b/target/linux/generic/patches-3.10/401-partial_eraseblock_write.patch index f2fa3676fb..fbc2d5f0e1 100644 --- a/target/linux/generic/patches-3.10/401-partial_eraseblock_write.patch +++ b/target/linux/generic/patches-3.10/401-partial_eraseblock_write.patch @@ -9,7 +9,7 @@ /* Our partition linked list */ static LIST_HEAD(mtd_partitions); static DEFINE_MUTEX(mtd_partitions_mutex); -@@ -230,13 +232,60 @@ static int part_erase(struct mtd_info *m +@@ -232,13 +234,60 @@ static int part_erase(struct mtd_info *m struct mtd_part *part = PART(mtd); int ret; @@ -70,7 +70,7 @@ return ret; } -@@ -244,7 +293,25 @@ void mtd_erase_callback(struct erase_inf +@@ -246,7 +295,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; -@@ -504,18 +571,24 @@ static struct mtd_part *allocate_partiti +@@ -506,18 +573,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 */ |