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 15:04:47 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-12-10 09:54:20 +0100
commit5d92949019d898889a2f2c5412662af9083e5bee (patch)
tree9ec05f7fc63c58ee4f3b679ca7713637ec5da573 /target/linux/generic/pending-4.14/400-mtd-add-rootfs-split-support.patch
parent361b5556728a4c069df4c4fb259fa141f71f3958 (diff)
downloadupstream-5d92949019d898889a2f2c5412662af9083e5bee.tar.gz
upstream-5d92949019d898889a2f2c5412662af9083e5bee.tar.bz2
upstream-5d92949019d898889a2f2c5412662af9083e5bee.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 68737803d8..e4b231fc26 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.
-@@ -658,6 +662,7 @@ int mtd_add_partition(struct mtd_info *p
- mutex_unlock(&mtd_partitions_mutex);
+@@ -661,6 +665,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);
-@@ -736,6 +741,35 @@ int mtd_del_partition(struct mtd_info *m
+ return 0;
+@@ -747,6 +752,35 @@ int mtd_del_partition(struct mtd_info *m
}
EXPORT_SYMBOL_GPL(mtd_del_partition);
@@ -104,10 +104,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
-@@ -767,6 +801,7 @@ int add_mtd_partitions(struct mtd_info *
- mutex_unlock(&mtd_partitions_mutex);
+@@ -787,6 +821,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 */