aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.19/411-mtd-partial_eraseblock_write.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-12-07 22:53:41 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2018-12-15 14:28:48 +0100
commite30ea44f687f22ee9285d09d43b1593d3f85bb47 (patch)
tree22da23e333cadabb6847df3bfd9d8f77b3d87ec0 /target/linux/generic/pending-4.19/411-mtd-partial_eraseblock_write.patch
parent9261e7447ea7b8d33b70ff6ea008f2041a88e255 (diff)
downloadupstream-e30ea44f687f22ee9285d09d43b1593d3f85bb47.tar.gz
upstream-e30ea44f687f22ee9285d09d43b1593d3f85bb47.tar.bz2
upstream-e30ea44f687f22ee9285d09d43b1593d3f85bb47.zip
kernel: Remove deprecated generic linux,part-probe patch
This is now replaced by some other mtd partition parsing which was merged into upstream. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-4.19/411-mtd-partial_eraseblock_write.patch')
-rw-r--r--target/linux/generic/pending-4.19/411-mtd-partial_eraseblock_write.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-4.19/411-mtd-partial_eraseblock_write.patch b/target/linux/generic/pending-4.19/411-mtd-partial_eraseblock_write.patch
index 978d6a6f7b..0b5e4005ff 100644
--- a/target/linux/generic/pending-4.19/411-mtd-partial_eraseblock_write.patch
+++ b/target/linux/generic/pending-4.19/411-mtd-partial_eraseblock_write.patch
@@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
-@@ -37,6 +37,8 @@
+@@ -36,6 +36,8 @@
#include "mtdcore.h"
#include "mtdsplit/mtdsplit.h"
@@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* Our partition linked list */
static LIST_HEAD(mtd_partitions);
static DEFINE_MUTEX(mtd_partitions_mutex);
-@@ -221,6 +223,53 @@ static int part_erase(struct mtd_info *m
+@@ -220,6 +222,53 @@ static int part_erase(struct mtd_info *m
{
struct mtd_part *part = mtd_to_part(mtd);
int ret;
@@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
instr->addr += part->offset;
ret = part->parent->_erase(part->parent, instr);
-@@ -228,6 +277,24 @@ static int part_erase(struct mtd_info *m
+@@ -227,6 +276,24 @@ static int part_erase(struct mtd_info *m
instr->fail_addr -= part->offset;
instr->addr -= part->offset;
@@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
return ret;
}
-@@ -536,19 +603,22 @@ static struct mtd_part *allocate_partiti
+@@ -535,19 +602,22 @@ static struct mtd_part *allocate_partiti
remainder = do_div(tmp, wr_alignment);
if ((slave->mtd.flags & MTD_WRITEABLE) && remainder) {
/* Doesn't start on a boundary of major erase size */