2018-03-03 03:30:39

by Aaro Koskinen

[permalink] [raw]
Subject: [PATCH] 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:
[ 0.868650] RAMDISK: Loading 2436KiB [1 disk] into ram disk... |
[ 1.490464] done.

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

Signed-off-by: Aaro Koskinen <[email protected]>
---
init/do_mounts_rd.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
index 99e0b64..e3cba12 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 (sys_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;
--
2.9.2



2018-03-03 16:15:36

by Andy Shevchenko

[permalink] [raw]
Subject: Re: [PATCH] init/ramdisk: use pr_cont() at the end of ramdisk loading

On Fri, Mar 2, 2018 at 10:55 PM, Aaro Koskinen <[email protected]> wrote:
> Use pr_cont() at the end of ramdisk loading. This will avoid the rotator
> and an extra newline appearing in the dmesg.

> printk("Error closing the disk.\n");

What about this one?

--
With Best Regards,
Andy Shevchenko

2018-03-04 21:16:17

by Aaro Koskinen

[permalink] [raw]
Subject: Re: [PATCH] init/ramdisk: use pr_cont() at the end of ramdisk loading

Hi,

On Sat, Mar 03, 2018 at 06:14:33PM +0200, Andy Shevchenko wrote:
> On Fri, Mar 2, 2018 at 10:55 PM, Aaro Koskinen <[email protected]> wrote:
> > Use pr_cont() at the end of ramdisk loading. This will avoid the rotator
> > and an extra newline appearing in the dmesg.
>
> > printk("Error closing the disk.\n");
>
> What about this one?

I think it should be left as is.

A.