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/404-mtd-add-more-helper-functions.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/404-mtd-add-more-helper-functions.patch')
| -rw-r--r-- | target/linux/generic/patches-4.4/404-mtd-add-more-helper-functions.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-4.4/404-mtd-add-more-helper-functions.patch b/target/linux/generic/patches-4.4/404-mtd-add-more-helper-functions.patch index be7ba7754d..3773e1f195 100644 --- a/target/linux/generic/patches-4.4/404-mtd-add-more-helper-functions.patch +++ b/target/linux/generic/patches-4.4/404-mtd-add-more-helper-functions.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -453,14 +453,12 @@ static struct mtd_part *allocate_partiti +@@ -454,14 +454,12 @@ static struct mtd_part *allocate_partiti if (slave->offset == MTDPART_OFS_APPEND) slave->offset = cur_offset; if (slave->offset == MTDPART_OFS_NXTBLK) { @@ -18,7 +18,7 @@ } if (slave->offset == MTDPART_OFS_RETAIN) { slave->offset = cur_offset; -@@ -687,6 +685,17 @@ run_parsers_by_type(struct mtd_part *sla +@@ -679,6 +677,17 @@ run_parsers_by_type(struct mtd_part *sla return nr_parts; } @@ -36,7 +36,7 @@ #ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME #define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME #else -@@ -986,6 +995,24 @@ int mtd_is_partition(const struct mtd_in +@@ -978,6 +987,24 @@ int mtd_is_partition(const struct mtd_in } EXPORT_SYMBOL_GPL(mtd_is_partition); |