diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-12-04 09:33:08 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-12-04 09:33:08 +0000 |
| commit | 4d71d66b4f1c93cbebed3b7bda7bb536332a0518 (patch) | |
| tree | d236332ef1a661e214e3a791622dac01d33b4e9b /target/linux/generic/patches-4.4/411-mtd-partial_eraseblock_write.patch | |
| parent | cc849c9ff6b5d371d4e9eeca45fc6a28893cd79a (diff) | |
| download | master-187ad058-4d71d66b4f1c93cbebed3b7bda7bb536332a0518.tar.gz master-187ad058-4d71d66b4f1c93cbebed3b7bda7bb536332a0518.tar.bz2 master-187ad058-4d71d66b4f1c93cbebed3b7bda7bb536332a0518.zip | |
kernel: drop unneeded modification of mtd_add_partition function
In old days mtd_add_partition was checking for partitions overlapping
which was breaking our splitting feature. We had to modify this function
by adding an extra bool dup_check parameter. Upstream commit:
3a434f66e6da ("mtd: part: Remove partition overlap checks")
removed that check so we don't need our modification anymore.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47748 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.4/411-mtd-partial_eraseblock_write.patch')
| -rw-r--r-- | target/linux/generic/patches-4.4/411-mtd-partial_eraseblock_write.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-4.4/411-mtd-partial_eraseblock_write.patch b/target/linux/generic/patches-4.4/411-mtd-partial_eraseblock_write.patch index e6e809cf3c..7ab8eb3442 100644 --- a/target/linux/generic/patches-4.4/411-mtd-partial_eraseblock_write.patch +++ b/target/linux/generic/patches-4.4/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); -@@ -235,13 +237,61 @@ static int part_erase(struct mtd_info *m +@@ -236,13 +238,61 @@ static int part_erase(struct mtd_info *m struct mtd_part *part = PART(mtd); int ret; @@ -71,7 +71,7 @@ return ret; } -@@ -249,7 +299,25 @@ void mtd_erase_callback(struct erase_inf +@@ -250,7 +300,25 @@ void mtd_erase_callback(struct erase_inf { if (instr->mtd->_erase == part_erase) { struct mtd_part *part = PART(instr->mtd); @@ -97,7 +97,7 @@ if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN) instr->fail_addr -= part->offset; instr->addr -= part->offset; -@@ -522,17 +590,20 @@ static struct mtd_part *allocate_partiti +@@ -523,17 +591,20 @@ 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 */ |