aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2018-04-10 16:34:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-04-11 10:28:36 -0700
commit1a6a05a4fa862631df738dae76b4531ee15e5a0f (patch)
tree37b4924bc7e3537ef48e4cdb7ef7f2636c5ce5ef /init
parent5d430902615bdea9d9bc205ed06ffc40d86ea66f (diff)
downloadlinux-1a6a05a4fa862631df738dae76b4531ee15e5a0f.tar.gz
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: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
-rw-r--r--init/do_mounts_rd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
index 12c159824c7b..035a5f0ab26b 100644
--- a/init/do_mounts_rd.c
+++ b/init/do_mounts_rd.c
@@ -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;