aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.14/400-mtd-add-rootfs-split-support.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-12-06 14:55:57 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-12-10 09:50:42 +0100
commitd395583d697c17f00a533d6efa13754c21630eda (patch)
treeae33b40523c93491c4e6b9017b8ef8a056e18ec3 /target/linux/generic/pending-4.14/400-mtd-add-rootfs-split-support.patch
parenta9b95921969eeb0b7b2271c95dd47a6a0c24a18a (diff)
downloadupstream-d395583d697c17f00a533d6efa13754c21630eda.tar.gz
upstream-d395583d697c17f00a533d6efa13754c21630eda.tar.bz2
upstream-d395583d697c17f00a533d6efa13754c21630eda.zip
kernel: bump 4.14 to 4.14.158
Refreshed all patches. Altered patches: - 400-mtd-add-rootfs-split-support.patch Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-4.14/400-mtd-add-rootfs-split-support.patch')
-rw-r--r--target/linux/generic/pending-4.14/400-mtd-add-rootfs-split-support.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/generic/pending-4.14/400-mtd-add-rootfs-split-support.patch b/target/linux/generic/pending-4.14/400-mtd-add-rootfs-split-support.patch
index 5f8899ea61..10ad99585d 100644
--- a/target/linux/generic/pending-4.14/400-mtd-add-rootfs-split-support.patch
+++ b/target/linux/generic/pending-4.14/400-mtd-add-rootfs-split-support.patch
@@ -60,15 +60,15 @@ 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.
-@@ -668,6 +672,7 @@ int mtd_add_partition(struct mtd_info *p
- mutex_unlock(&mtd_partitions_mutex);
+@@ -671,6 +675,7 @@ int mtd_add_partition(struct mtd_info *p
+ if (ret)
+ goto err_remove_part;
- add_mtd_device(&new->mtd);
+ mtd_partition_split(parent, new);
-
mtd_add_partition_attrs(new);
-@@ -746,6 +751,29 @@ int mtd_del_partition(struct mtd_info *m
+ return 0;
+@@ -757,6 +762,29 @@ int mtd_del_partition(struct mtd_info *m
}
EXPORT_SYMBOL_GPL(mtd_del_partition);
@@ -98,10 +98,10 @@ 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
-@@ -777,6 +805,7 @@ int add_mtd_partitions(struct mtd_info *
- mutex_unlock(&mtd_partitions_mutex);
+@@ -797,6 +825,7 @@ int add_mtd_partitions(struct mtd_info *
+ goto err_del_partitions;
+ }
- add_mtd_device(&slave->mtd);
+ mtd_partition_split(master, slave);
mtd_add_partition_attrs(slave);
/* Look for subpartitions */