Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a6a05a4 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Linus Torvalds
Browse files

init/ramdisk: use pr_cont() at the end of ramdisk loading 

Use pr_cont() at the end of ramdisk loading.  This will avoid the
rotator and an extra newline appearing in the dmesg.

Before:
  RAMDISK: Loading 2436KiB [1 disk] into ram disk... |
  done.

After:
  RAMDISK: Loading 2436KiB [1 disk] into ram disk... done.

Link: http://lkml.kernel.org/r/20180302205552.16031-1-aaro.koskinen@iki.fi


Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5d430902

init/do_mounts_rd.c

+2 −2
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ int __init rd_load_image(char *from) 
		nblocks, ((nblocks-1)/devblocks)+1, nblocks>devblocks ? "s" : "");

	for (i = 0, disk = 1; i < nblocks; i++) {

		if (i && (i % devblocks == 0)) {

			printk("done disk #%d.\n", disk++);

			pr_cont("done disk #%d.\n", disk++);

			rotate = 0;

			if (ksys_close(in_fd)) {

				printk("Error closing the disk.\n");
@@ -278,7 +278,7 @@ int __init rd_load_image(char *from) 
		}

#endif

	}

	printk("done.\n");

	pr_cont("done.\n");



successful_load:

	res = 1;