diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2014-10-06 15:07:54 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2014-10-06 15:07:54 +0000 |
| commit | e7106c5746e5be1e81f1b56df82c797b7d753b7c (patch) | |
| tree | facde217850b66d812cb38fcbdffba3c8858a26f /target/linux/generic/patches-3.14/400-mtd-add-rootfs-split-support.patch | |
| parent | aa7c9cf2997d6155b02123dbebc9e6d38ef3210d (diff) | |
| download | upstream-e7106c5746e5be1e81f1b56df82c797b7d753b7c.tar.gz upstream-e7106c5746e5be1e81f1b56df82c797b7d753b7c.tar.bz2 upstream-e7106c5746e5be1e81f1b56df82c797b7d753b7c.zip | |
kernel: add some warnings to the old (built-in) rootfs splitter
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42806 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.14/400-mtd-add-rootfs-split-support.patch')
| -rw-r--r-- | target/linux/generic/patches-3.14/400-mtd-add-rootfs-split-support.patch | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.14/400-mtd-add-rootfs-split-support.patch b/target/linux/generic/patches-3.14/400-mtd-add-rootfs-split-support.patch index 4e68d8cbd5..e618dd6224 100644 --- a/target/linux/generic/patches-3.14/400-mtd-add-rootfs-split-support.patch +++ b/target/linux/generic/patches-3.14/400-mtd-add-rootfs-split-support.patch @@ -125,7 +125,7 @@ int mtd_del_partition(struct mtd_info *master, int partno) { struct mtd_part *slave, *next; -@@ -614,6 +628,117 @@ int mtd_del_partition(struct mtd_info *m +@@ -614,6 +628,122 @@ int mtd_del_partition(struct mtd_info *m } EXPORT_SYMBOL_GPL(mtd_del_partition); @@ -168,6 +168,11 @@ + if (split_offset <= 0) + return; + ++ if (config_enabled(CONFIG_MTD_SPLIT_SQUASHFS_ROOT)) ++ pr_err("Dedicated partitioner didn't create \"rootfs_data\" partition, please fill a bug report!\n"); ++ else ++ pr_warn("Support for built-in \"rootfs_data\" splitter will be removed, please use CONFIG_MTD_SPLIT_SQUASHFS_ROOT\n"); ++ + split_size = part->mtd.size - (split_offset - part->offset); + printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=0x%x, len=0x%x\n", + ROOTFS_SPLIT_NAME, split_offset, split_size); @@ -243,7 +248,7 @@ /* * 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 -@@ -643,6 +768,7 @@ int add_mtd_partitions(struct mtd_info * +@@ -643,6 +773,7 @@ int add_mtd_partitions(struct mtd_info * mutex_unlock(&mtd_partitions_mutex); add_mtd_device(&slave->mtd); |