diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2017-06-23 10:27:20 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2017-06-23 11:40:05 +0200 |
| commit | 8c1e760ab60994de26d2a2c85f91e86192999dfb (patch) | |
| tree | 741281d011dac79b540cc69ed4cd39f6a426ecb8 /target/linux/generic/patches-4.9/401-mtd-add-support-for-different-partition-parser-types.patch | |
| parent | 4052443a235433fb97af9711bf6429cd05820ba9 (diff) | |
| download | upstream-8c1e760ab60994de26d2a2c85f91e86192999dfb.tar.gz upstream-8c1e760ab60994de26d2a2c85f91e86192999dfb.tar.bz2 upstream-8c1e760ab60994de26d2a2c85f91e86192999dfb.zip | |
kernel: backport upstream mtdpart.c cleanups
Except for renames and line changes the only conflict was in
allocate_partition in handling MTD_WRITEABLE. Hopefully it was handled
correctly.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/generic/patches-4.9/401-mtd-add-support-for-different-partition-parser-types.patch')
| -rw-r--r-- | target/linux/generic/patches-4.9/401-mtd-add-support-for-different-partition-parser-types.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-4.9/401-mtd-add-support-for-different-partition-parser-types.patch b/target/linux/generic/patches-4.9/401-mtd-add-support-for-different-partition-parser-types.patch index a5e1fd7edb..71a97a00f4 100644 --- a/target/linux/generic/patches-4.9/401-mtd-add-support-for-different-partition-parser-types.patch +++ b/target/linux/generic/patches-4.9/401-mtd-add-support-for-different-partition-parser-types.patch @@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c -@@ -945,6 +945,62 @@ void mtd_part_parser_cleanup(struct mtd_ +@@ -996,6 +996,62 @@ void mtd_part_parser_cleanup(struct mtd_ } } @@ -76,7 +76,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> struct mtd_part *part; --- a/include/linux/mtd/partitions.h +++ b/include/linux/mtd/partitions.h -@@ -60,11 +60,14 @@ struct mtd_part_parser_data { +@@ -61,11 +61,14 @@ struct mtd_part_parser_data { unsigned long origin; }; @@ -92,7 +92,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> struct mtd_part_parser { struct list_head list; struct module *owner; -@@ -72,6 +75,7 @@ struct mtd_part_parser { +@@ -73,6 +76,7 @@ struct mtd_part_parser { int (*parse_fn)(struct mtd_info *, const struct mtd_partition **, struct mtd_part_parser_data *); void (*cleanup)(const struct mtd_partition *pparts, int nr_parts); @@ -100,7 +100,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> }; /* Container for passing around a set of parsed partitions */ -@@ -104,4 +108,9 @@ uint64_t mtd_get_device_size(const struc +@@ -105,4 +109,9 @@ uint64_t mtd_get_device_size(const struc extern void __weak arch_split_mtd_part(struct mtd_info *master, const char *name, int offset, int size); |