aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.19/400-mtd-add-rootfs-split-support.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-12-07 22:53:41 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2018-12-15 14:28:48 +0100
commite30ea44f687f22ee9285d09d43b1593d3f85bb47 (patch)
tree22da23e333cadabb6847df3bfd9d8f77b3d87ec0 /target/linux/generic/pending-4.19/400-mtd-add-rootfs-split-support.patch
parent9261e7447ea7b8d33b70ff6ea008f2041a88e255 (diff)
downloadupstream-e30ea44f687f22ee9285d09d43b1593d3f85bb47.tar.gz
upstream-e30ea44f687f22ee9285d09d43b1593d3f85bb47.tar.bz2
upstream-e30ea44f687f22ee9285d09d43b1593d3f85bb47.zip
kernel: Remove deprecated generic linux,part-probe patch
This is now replaced by some other mtd partition parsing which was merged into upstream. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-4.19/400-mtd-add-rootfs-split-support.patch')
-rw-r--r--target/linux/generic/pending-4.19/400-mtd-add-rootfs-split-support.patch11
1 files changed, 5 insertions, 6 deletions
diff --git a/target/linux/generic/pending-4.19/400-mtd-add-rootfs-split-support.patch b/target/linux/generic/pending-4.19/400-mtd-add-rootfs-split-support.patch
index c449fef041..6fdd0267c1 100644
--- a/target/linux/generic/pending-4.19/400-mtd-add-rootfs-split-support.patch
+++ b/target/linux/generic/pending-4.19/400-mtd-add-rootfs-split-support.patch
@@ -37,12 +37,11 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
depends on m
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
-@@ -29,11 +29,13 @@
+@@ -29,10 +29,12 @@
#include <linux/kmod.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
+#include <linux/magic.h>
- #include <linux/of.h>
#include <linux/err.h>
#include <linux/of.h>
@@ -51,7 +50,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* Our partition linked list */
static LIST_HEAD(mtd_partitions);
-@@ -53,6 +55,8 @@ struct mtd_part {
+@@ -52,6 +54,8 @@ struct mtd_part {
struct list_head list;
};
@@ -60,7 +59,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.
-@@ -620,6 +624,7 @@ int mtd_add_partition(struct mtd_info *p
+@@ -619,6 +623,7 @@ int mtd_add_partition(struct mtd_info *p
mutex_unlock(&mtd_partitions_mutex);
add_mtd_device(&new->mtd);
@@ -68,7 +67,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
mtd_add_partition_attrs(new);
-@@ -698,6 +703,29 @@ int mtd_del_partition(struct mtd_info *m
+@@ -697,6 +702,29 @@ int mtd_del_partition(struct mtd_info *m
}
EXPORT_SYMBOL_GPL(mtd_del_partition);
@@ -98,7 +97,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
-@@ -729,6 +757,7 @@ int add_mtd_partitions(struct mtd_info *
+@@ -728,6 +756,7 @@ int add_mtd_partitions(struct mtd_info *
mutex_unlock(&mtd_partitions_mutex);
add_mtd_device(&slave->mtd);