2009-06-23 07:21:28

by Ingo Molnar

Subject: Re: + printk-boot_delay-rename-printk_delay_msec-to-loops_per_msec.patch added to -mm tree

> +++ a/kernel/printk.c
> @@ -198,12 +198,11 @@ __setup("log_buf_len=", log_buf_len_setu
> #ifdef CONFIG_BOOT_PRINTK_DELAY
>
> static unsigned int boot_delay; /* msecs delay after each printk during bootup */
> -static unsigned long long printk_delay_msec; /* per msec, based on boot_delay */
> +static unsigned long long loops_per_msec;

Lost a comment here - on purpose?

> - printk_delay_msec = loops_per_msec;
> printk(KERN_DEBUG "boot_delay: %u, preset_lpj: %ld, lpj: %lu, "
> - "HZ: %d, printk_delay_msec: %llu\n",
> - boot_delay, preset_lpj, lpj, HZ, printk_delay_msec);
> + "HZ: %d, loops_per_msec: %llu\n",
> + boot_delay, preset_lpj, lpj, HZ, loops_per_msec);

If you touch debug printks then please use pr_debug().

Ingo

2009-06-23 12:54:24

by Dave Young

Subject: Re: + printk-boot_delay-rename-printk_delay_msec-to-loops_per_msec.patch added to -mm tree

On Tue, Jun 23, 2009 at 09:21:16AM +0200, Ingo Molnar wrote:
>
> > +++ a/kernel/printk.c
> > @@ -198,12 +198,11 @@ __setup("log_buf_len=", log_buf_len_setu
> > #ifdef CONFIG_BOOT_PRINTK_DELAY
> >
> > static unsigned int boot_delay; /* msecs delay after each printk during bootup */
> > -static unsigned long long printk_delay_msec; /* per msec, based on boot_delay */
> > +static unsigned long long loops_per_msec;
>
> Lost a comment here - on purpose?

Yes, I thought loops_per_msec is clearer than printk_delay_msec for boot_delay, but add a comment is fine.

Andrew have fixed it, thanks.

>
> > - printk_delay_msec = loops_per_msec;
> > printk(KERN_DEBUG "boot_delay: %u, preset_lpj: %ld, lpj: %lu, "
> > - "HZ: %d, printk_delay_msec: %llu\n",
> > - boot_delay, preset_lpj, lpj, HZ, printk_delay_msec);
> > + "HZ: %d, loops_per_msec: %llu\n",
> > + boot_delay, preset_lpj, lpj, HZ, loops_per_msec);
>
> If you touch debug printks then please use pr_debug().
>
> Ingo

please see the following fix:
--

From: Dave Young <[email protected]>

use pr_debug for debug printk.

Signed-off-by: Dave Young <[email protected]>
---
kernel/printk.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-2.6.orig/kernel/printk.c 2009-06-23 17:48:25.000000000 +0800
+++ linux-2.6/kernel/printk.c 2009-06-23 18:08:18.000000000 +0800
@@ -211,7 +211,7 @@ static int __init boot_delay_setup(char
if (boot_delay > 10 * 1000)
boot_delay = 0;

- printk(KERN_DEBUG "boot_delay: %u, preset_lpj: %ld, lpj: %lu, "
+ pr_debug("boot_delay: %u, preset_lpj: %ld, lpj: %lu, "
"HZ: %d, loops_per_msec: %llu\n",
boot_delay, preset_lpj, lpj, HZ, loops_per_msec);
return 1;