Skip to content

Commit

Permalink
init/ramdisk: use pr_cont() at the end of ramdisk loading
Browse files Browse the repository at this point in the history
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/[email protected]
Signed-off-by: Aaro Koskinen <[email protected]>
Reviewed-by: Andrew Morton <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
aakoskin authored and torvalds committed Apr 11, 2018
1 parent 5d43090 commit 1a6a05a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions init/do_mounts_rd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -278,7 +278,7 @@ int __init rd_load_image(char *from)
}
#endif
}
printk("done.\n");
pr_cont("done.\n");

successful_load:
res = 1;
Expand Down

0 comments on commit 1a6a05a

Please sign in to comment.