diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-10-11 19:08:08 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-10-11 19:08:08 +0000 |
| commit | b5842aed82e0c9101e99ec4bcf5959b931e98989 (patch) | |
| tree | f9749eb8ce7d61f284cc4d91bac5aafd07de8344 /target/linux/generic/patches-4.3/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch | |
| parent | 3d1a65adb41db2758827fe81f36d92ab61618ea3 (diff) | |
| download | upstream-b5842aed82e0c9101e99ec4bcf5959b931e98989.tar.gz upstream-b5842aed82e0c9101e99ec4bcf5959b931e98989.tar.bz2 upstream-b5842aed82e0c9101e99ec4bcf5959b931e98989.zip | |
kernel: generic: add kernel 4.3
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 47182
Diffstat (limited to 'target/linux/generic/patches-4.3/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch')
| -rw-r--r-- | target/linux/generic/patches-4.3/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.3/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch b/target/linux/generic/patches-4.3/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch new file mode 100644 index 0000000000..f55e8e3a4d --- /dev/null +++ b/target/linux/generic/patches-4.3/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch @@ -0,0 +1,37 @@ +From cd68d1b12b5ea4c01a664c064179ada42bf55d3d Mon Sep 17 00:00:00 2001 +From: Daniel Golle <daniel@makrotopia.org> +Date: Thu, 15 May 2014 20:55:42 +0200 +Subject: [PATCH 5/5] ubi: set ROOT_DEV to ubiblock "rootfs" if unset +To: openwrt-devel@lists.openwrt.org + +Signed-off-by: Daniel Golle <daniel@makrotopia.org> +--- + drivers/mtd/ubi/block.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +--- a/drivers/mtd/ubi/block.c ++++ b/drivers/mtd/ubi/block.c +@@ -50,6 +50,7 @@ + #include <linux/scatterlist.h> + #include <linux/idr.h> + #include <asm/div64.h> ++#include <linux/root_dev.h> + + #include "ubi-media.h" + #include "ubi.h" +@@ -448,6 +449,15 @@ int ubiblock_create(struct ubi_volume_in + add_disk(dev->gd); + dev_info(disk_to_dev(dev->gd), "created from ubi%d:%d(%s)", + dev->ubi_num, dev->vol_id, vi->name); ++ ++ if (!strcmp(vi->name, "rootfs") && ++ config_enabled(CONFIG_MTD_ROOTFS_ROOT_DEV) && ++ ROOT_DEV == 0) { ++ pr_notice("ubiblock: device ubiblock%d_%d (%s) set to be root filesystem\n", ++ dev->ubi_num, dev->vol_id, vi->name); ++ ROOT_DEV = MKDEV(gd->major, gd->first_minor); ++ } ++ + return 0; + + out_free_queue: |