kernel: backport mtd patch for minor partitioning cleanup

[openwrt/staging/dedeckeh.git] / target / linux / generic / pending-4.9 / 400-mtd-add-rootfs-split-support.patch

diff --git a/target/linux/generic/pending-4.9/400-mtd-add-rootfs-split-support.patch b/target/linux/generic/pending-4.9/400-mtd-add-rootfs-split-support.patch
index ef7a6df3ea4d37cdbcf98c1a1c18d60fd4ded33d..10be7a16ab72b2ce12a981f553b73674b14da690 100644 (file)
--- a/target/linux/generic/pending-4.9/400-mtd-add-rootfs-split-support.patch
+++ b/target/linux/generic/pending-4.9/400-mtd-add-rootfs-split-support.patch
@@ -60,7 +60,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  /*
   * Given a pointer to the MTD object in the mtd_part structure, we can retrieve
   * the pointer to that structure.
-@@ -679,6 +683,7 @@ int mtd_add_partition(struct mtd_info *p
+@@ -666,6 +670,7 @@ int mtd_add_partition(struct mtd_info *p
        mutex_unlock(&mtd_partitions_mutex);
  
        add_mtd_device(&new->mtd);
@@ -68,7 +68,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
        mtd_add_partition_attrs(new);
  
-@@ -757,6 +762,35 @@ int mtd_del_partition(struct mtd_info *m
+@@ -744,6 +749,35 @@ int mtd_del_partition(struct mtd_info *m
  }
  EXPORT_SYMBOL_GPL(mtd_del_partition);
  
@@ -104,7 +104,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  /*
   * This function, given a master MTD object and a partition table, creates
   * and registers slave MTD objects which are bound to the master according to
-@@ -788,6 +822,7 @@ int add_mtd_partitions(struct mtd_info *
+@@ -775,6 +809,7 @@ int add_mtd_partitions(struct mtd_info *
                mutex_unlock(&mtd_partitions_mutex);
  
                add_mtd_device(&slave->mtd);