kernel: rename CONFIG_TRACE_ENUM_MAP_FILE to CONFIG_TRACE_EVAL_MAP_FILE
[oweals/openwrt.git] / target / linux / ipq806x / patches-4.9 / 0061-mtd-rootfs-conflicts-with-OpenWrt-auto-mounting.patch
1 From 5001f2e1a325b68dbf225bd17f69a4d3d975cca5 Mon Sep 17 00:00:00 2001
2 From: John Crispin <john@phrozen.org>
3 Date: Thu, 9 Mar 2017 09:31:44 +0100
4 Subject: [PATCH 61/69] mtd: "rootfs" conflicts with OpenWrt auto mounting
5
6 Signed-off-by: John Crispin <john@phrozen.org>
7 ---
8  drivers/mtd/qcom_smem_part.c | 4 ++++
9  1 file changed, 4 insertions(+)
10
11 --- a/drivers/mtd/qcom_smem_part.c
12 +++ b/drivers/mtd/qcom_smem_part.c
13 @@ -189,6 +189,10 @@ static int parse_qcom_smem_partitions(st
14                 m_part->size = le32_to_cpu(s_part->size) * (*smem_blksz);
15                 m_part->offset = le32_to_cpu(s_part->start) * (*smem_blksz);
16  
17 +               /* "rootfs" conflicts with OpenWrt auto mounting */
18 +               if (mtd_type_is_nand(master) && !strcmp(m_part->name, "rootfs"))
19 +                       m_part->name = "ubi";
20 +
21                 /*
22                  * The last SMEM partition may have its size marked as
23                  * something like 0xffffffff, which means "until the end of the