[source] kernel/4.4: add missing newline character to UBI messages

LEDE Commits lede-commits at lists.infradead.org
Sun Dec 24 00:03:16 PST 2017


blogic pushed a commit to source.git, branch master:
https://git.lede-project.org/bb51193acd4e1046fe731199a19b46ffcd461de5

commit bb51193acd4e1046fe731199a19b46ffcd461de5
Author: Gabor Juhos <juhosg at freemail.hu>
AuthorDate: Tue Dec 19 09:11:24 2017 +0100

    kernel/4.4: add missing newline character to UBI messages
    
    A few UBI messages lacks the trailing newline character which
    leads to ugly lines in the bootlog like this:
    
      [    6.649159] UBI error: no valid UBI magic found inside mtd6[    6.667751] Freeing unused kernel memory: 2196K
    
    Add a newline character to the end of the messages to fix it.
    After the fix the line from above looks better in the log:
    
      [    6.609182] UBI error: no valid UBI magic found inside mtd6
      [    6.627599] Freeing unused kernel memory: 2132K
    
    Signed-off-by: Gabor Juhos <juhosg at freemail.hu>
---
 .../490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch  | 6 +++---
 .../generic/pending-4.4/494-mtd-ubi-add-EOF-marker-support.patch    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/target/linux/generic/pending-4.4/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/pending-4.4/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
index f08f9b4..b15066f 100644
--- a/target/linux/generic/pending-4.4/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
+++ b/target/linux/generic/pending-4.4/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch
@@ -36,7 +36,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
 +		/* check for a valid ubi magic */
 +		err = mtd_read(mtd, 0, 4, &len, (void *) magic);
 +		if (!err && len == 4 && strncmp(magic, "UBI#", 4)) {
-+			pr_err("UBI error: no valid UBI magic found inside mtd%d", mtd->index);
++			pr_err("UBI error: no valid UBI magic found inside mtd%d\n", mtd->index);
 +			put_mtd_device(mtd);
 +			return;
 +		}
@@ -47,11 +47,11 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
 +		    mtd->type == MTD_DATAFLASH ||
 +		    mtd->type == MTD_MLCNANDFLASH) {
 +			mutex_lock(&ubi_devices_mutex);
-+			pr_notice("UBI: auto-attach mtd%d", mtd->index);
++			pr_notice("UBI: auto-attach mtd%d\n", mtd->index);
 +			err = ubi_attach_mtd_dev(mtd, UBI_DEV_NUM_AUTO, 0, 0);
 +			mutex_unlock(&ubi_devices_mutex);
 +			if (err < 0) {
-+				pr_err("UBI error: cannot attach mtd%d", mtd->index);
++				pr_err("UBI error: cannot attach mtd%d\n", mtd->index);
 +				put_mtd_device(mtd);
 +			}
 +		}
diff --git a/target/linux/generic/pending-4.4/494-mtd-ubi-add-EOF-marker-support.patch b/target/linux/generic/pending-4.4/494-mtd-ubi-add-EOF-marker-support.patch
index dd5ee30..749232a 100644
--- a/target/linux/generic/pending-4.4/494-mtd-ubi-add-EOF-marker-support.patch
+++ b/target/linux/generic/pending-4.4/494-mtd-ubi-add-EOF-marker-support.patch
@@ -27,7 +27,7 @@
 +			return err;
 +
 +		if (ec_hdr_has_eof(ech)) {
-+			pr_notice("UBI: EOF marker found, PEBs from %d will be erased",
++			pr_notice("UBI: EOF marker found, PEBs from %d will be erased\n",
 +				pnum);
 +			ai->eof_found = true;
 +		}



More information about the lede-commits mailing list