* [PATCH >=2.6.4] single-line, but KERN_WARNING message in p4-clockmod
@ 2004-02-14 16:01 Dominik Brodowski
2004-02-14 16:41 ` Dave Jones
0 siblings, 1 reply; 5+ messages in thread
From: Dominik Brodowski @ 2004-02-14 16:01 UTC (permalink / raw)
To: davej; +Cc: cpufreq
As Pavel Machek told me, a single line warning is better, and KERN_DEBUG might
be missed if reading from /var/log/messages.
arch/i386/kernel/cpu/cpufreq/p4-clockmod.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff -ruN linux-original/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c linux/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
--- linux-original/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c 2004-02-13 17:09:58.000000000 +0100
+++ linux/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c 2004-02-14 16:51:47.012905264 +0100
@@ -181,9 +181,7 @@
{
if ((c->x86 == 0x06) && (c->x86_model == 0x09)) {
/* Pentium M */
- printk(KERN_DEBUG PFX "Warning: Pentium M detected. The speedstep_centrino module\n");
- printk(KERN_DEBUG PFX "offers voltage scaling in addition of frequency scaling. You\n");
- printk(KERN_DEBUG PFX "should use that instead of p4-clockmod, if possible.\n");
+ printk(KERN_WARNING PFX "Warning: Pentium M detected. The speedstep_centrino module offers voltage scaling in addition of frequency scaling. You should use that instead of p4-clockmod, if possible.\n");
return speedstep_get_processor_frequency(SPEEDSTEP_PROCESSOR_PM);
}
@@ -193,9 +191,7 @@
}
if (speedstep_detect_processor() == SPEEDSTEP_PROCESSOR_P4M) {
- printk(KERN_DEBUG PFX "Warning: Pentium 4-M detected. The speedstep-ich or acpi cpufreq \n");
- printk(KERN_DEBUG PFX "modules offers voltage scaling in addition of frequency scaling. You\n");
- printk(KERN_DEBUG PFX "should use either one instead of p4-clockmod, if possible.\n");
+ printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. The speedstep-ich or acpi cpufreq modules offers voltage scaling in addition of frequency scaling. You should use either one instead of p4-clockmod, if possible.\n");
return speedstep_get_processor_frequency(SPEEDSTEP_PROCESSOR_P4M);
}
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH >=2.6.4] single-line, but KERN_WARNING message in p4-clockmod
2004-02-14 16:01 [PATCH >=2.6.4] single-line, but KERN_WARNING message in p4-clockmod Dominik Brodowski
@ 2004-02-14 16:41 ` Dave Jones
2004-02-14 18:23 ` Dominik Brodowski
0 siblings, 1 reply; 5+ messages in thread
From: Dave Jones @ 2004-02-14 16:41 UTC (permalink / raw)
To: cpufreq
On Sat, Feb 14, 2004 at 05:01:05PM +0100, Dominik Brodowski wrote:
> As Pavel Machek told me, a single line warning is better, and KERN_DEBUG might
> be missed if reading from /var/log/messages.
>
> arch/i386/kernel/cpu/cpufreq/p4-clockmod.c | 8 ++------
> 1 files changed, 2 insertions(+), 6 deletions(-)
>
> diff -ruN linux-original/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c linux/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
> --- linux-original/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c 2004-02-13 17:09:58.000000000 +0100
> +++ linux/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c 2004-02-14 16:51:47.012905264 +0100
> @@ -181,9 +181,7 @@
> {
> if ((c->x86 == 0x06) && (c->x86_model == 0x09)) {
> /* Pentium M */
> - printk(KERN_DEBUG PFX "Warning: Pentium M detected. The speedstep_centrino module\n");
> - printk(KERN_DEBUG PFX "offers voltage scaling in addition of frequency scaling. You\n");
> - printk(KERN_DEBUG PFX "should use that instead of p4-clockmod, if possible.\n");
> + printk(KERN_WARNING PFX "Warning: Pentium M detected. The speedstep_centrino module offers voltage scaling in addition of frequency scaling. You should use that instead of p4-clockmod, if possible.\n");
> return speedstep_get_processor_frequency(SPEEDSTEP_PROCESSOR_PM);
> }
>
> @@ -193,9 +191,7 @@
> }
>
> if (speedstep_detect_processor() == SPEEDSTEP_PROCESSOR_P4M) {
> - printk(KERN_DEBUG PFX "Warning: Pentium 4-M detected. The speedstep-ich or acpi cpufreq \n");
> - printk(KERN_DEBUG PFX "modules offers voltage scaling in addition of frequency scaling. You\n");
> - printk(KERN_DEBUG PFX "should use either one instead of p4-clockmod, if possible.\n");
> + printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. The speedstep-ich or acpi cpufreq modules offers voltage scaling in addition of frequency scaling. You should use either one instead of p4-clockmod, if possible.\n");
> return speedstep_get_processor_frequency(SPEEDSTEP_PROCESSOR_P4M);
> }
I'd rather keep them multi-line in the source. It looks a lot more readable than just
one line IMHO. I've no objection to killing off the \n's though.
Dave
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH >=2.6.4] single-line, but KERN_WARNING message in p4-clockmod
2004-02-14 16:41 ` Dave Jones
@ 2004-02-14 18:23 ` Dominik Brodowski
2004-02-14 18:29 ` Russell King
0 siblings, 1 reply; 5+ messages in thread
From: Dominik Brodowski @ 2004-02-14 18:23 UTC (permalink / raw)
To: Dave Jones; +Cc: cpufreq
On Sat, Feb 14, 2004 at 04:41:42PM +0000, Dave Jones wrote:
> I'd rather keep them multi-line in the source. It looks a lot more readable than just
> one line IMHO. I've no objection to killing off the \n's though.
As Pavel Machek told me, a single line warning is better, and KERN_DEBUG might
be missed if reading from /var/log/messages. As Dave Jones told me, multi-line
printk's are more readable, though.
arch/i386/kernel/cpu/cpufreq/p4-clockmod.c | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
Dominik
diff -ruN linux-original/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c linux/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
--- linux-original/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c 2004-02-14 19:22:23.907928496 +0100
+++ linux/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c 2004-02-14 19:18:37.167398296 +0100
@@ -181,21 +181,24 @@
{
if ((c->x86 == 0x06) && (c->x86_model == 0x09)) {
/* Pentium M */
- printk(KERN_DEBUG PFX "Warning: Pentium M detected. The speedstep_centrino module\n");
- printk(KERN_DEBUG PFX "offers voltage scaling in addition of frequency scaling. You\n");
- printk(KERN_DEBUG PFX "should use that instead of p4-clockmod, if possible.\n");
+ printk(KERN_WARNING PFX "Warning: Pentium M detected. ");
+ printk("The speedstep_centrino module offers voltage scaling");
+ printk(" in addition of frequency scaling. You should use ");
+ printk("that instead of p4-clockmod, if possible.\n");
return speedstep_get_processor_frequency(SPEEDSTEP_PROCESSOR_PM);
}
if (c->x86 != 0xF) {
- printk(KERN_DEBUG PFX "Unknown p4-clockmod-capable CPU. Please send an e-mail to <linux@brodo.de>\n");
+ printk(KERN_WARNING PFX "Unknown p4-clockmod-capable CPU. Please send an e-mail to <linux@brodo.de>\n");
return 0;
}
if (speedstep_detect_processor() == SPEEDSTEP_PROCESSOR_P4M) {
- printk(KERN_DEBUG PFX "Warning: Pentium 4-M detected. The speedstep-ich or acpi cpufreq \n");
- printk(KERN_DEBUG PFX "modules offers voltage scaling in addition of frequency scaling. You\n");
- printk(KERN_DEBUG PFX "should use either one instead of p4-clockmod, if possible.\n");
+ printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. ");
+ printk("The speedstep-ich or acpi cpufreq modules offers ");
+ printk("voltage scaling in addition of frequency scaling. ");
+ printk("You should use either one instead of p4-clockmod, ");
+ printk("if possible.\n");
return speedstep_get_processor_frequency(SPEEDSTEP_PROCESSOR_P4M);
}
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH >=2.6.4] single-line, but KERN_WARNING message in p4-clockmod
2004-02-14 18:23 ` Dominik Brodowski
@ 2004-02-14 18:29 ` Russell King
2004-02-14 18:45 ` Dominik Brodowski
0 siblings, 1 reply; 5+ messages in thread
From: Russell King @ 2004-02-14 18:29 UTC (permalink / raw)
To: Dave Jones, cpufreq
On Sat, Feb 14, 2004 at 07:23:30PM +0100, Dominik Brodowski wrote:
> if ((c->x86 == 0x06) && (c->x86_model == 0x09)) {
> /* Pentium M */
> - printk(KERN_DEBUG PFX "Warning: Pentium M detected. The speedstep_centrino module\n");
> - printk(KERN_DEBUG PFX "offers voltage scaling in addition of frequency scaling. You\n");
> - printk(KERN_DEBUG PFX "should use that instead of p4-clockmod, if possible.\n");
> + printk(KERN_WARNING PFX "Warning: Pentium M detected. ");
> + printk("The speedstep_centrino module offers voltage scaling");
> + printk(" in addition of frequency scaling. You should use ");
> + printk("that instead of p4-clockmod, if possible.\n");
I think that's a lot worse for one major reason - you loose the atomicity
of printk() if you do that, especially if you use serial console.
I haven't seen this done anywhere else in the kernel... lets not start
doing it now.
printk(KERN_WARNING PFX "Warning: Pentium M detected. "
"The speedstep_centrino module offers voltage scaling "
"in addition of frequency scaling. You should use "
"that instead of p4-clockmod, if possible.\n");
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH >=2.6.4] single-line, but KERN_WARNING message in p4-clockmod
2004-02-14 18:29 ` Russell King
@ 2004-02-14 18:45 ` Dominik Brodowski
0 siblings, 0 replies; 5+ messages in thread
From: Dominik Brodowski @ 2004-02-14 18:45 UTC (permalink / raw)
To: Dave Jones, cpufreq
On Sat, Feb 14, 2004 at 06:29:50PM +0000, Russell King wrote:
> On Sat, Feb 14, 2004 at 07:23:30PM +0100, Dominik Brodowski wrote:
> > if ((c->x86 == 0x06) && (c->x86_model == 0x09)) {
> > /* Pentium M */
> > - printk(KERN_DEBUG PFX "Warning: Pentium M detected. The speedstep_centrino module\n");
> > - printk(KERN_DEBUG PFX "offers voltage scaling in addition of frequency scaling. You\n");
> > - printk(KERN_DEBUG PFX "should use that instead of p4-clockmod, if possible.\n");
> > + printk(KERN_WARNING PFX "Warning: Pentium M detected. ");
> > + printk("The speedstep_centrino module offers voltage scaling");
> > + printk(" in addition of frequency scaling. You should use ");
> > + printk("that instead of p4-clockmod, if possible.\n");
>
> I think that's a lot worse for one major reason - you loose the atomicity
> of printk() if you do that, especially if you use serial console.
>
> I haven't seen this done anywhere else in the kernel... lets not start
> doing it now.
>
> printk(KERN_WARNING PFX "Warning: Pentium M detected. "
> "The speedstep_centrino module offers voltage scaling "
> "in addition of frequency scaling. You should use "
> "that instead of p4-clockmod, if possible.\n");
Thanks,
Dominik
Use KERN_WARNING for warning. Thanks to Dave Jones, Pavel Machel and Russell
King for their help getting this patch right.
arch/i386/kernel/cpu/cpufreq/p4-clockmod.c | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff -ruN linux-original/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c linux/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
--- linux-original/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c 2004-02-14 19:22:23.907928496 +0100
+++ linux/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c 2004-02-14 19:41:32.135371392 +0100
@@ -181,21 +181,24 @@
{
if ((c->x86 == 0x06) && (c->x86_model == 0x09)) {
/* Pentium M */
- printk(KERN_DEBUG PFX "Warning: Pentium M detected. The speedstep_centrino module\n");
- printk(KERN_DEBUG PFX "offers voltage scaling in addition of frequency scaling. You\n");
- printk(KERN_DEBUG PFX "should use that instead of p4-clockmod, if possible.\n");
+ printk(KERN_WARNING PFX "Warning: Pentium M detected. "
+ "The speedstep_centrino module offers voltage scaling"
+ " in addition of frequency scaling. You should use "
+ "that instead of p4-clockmod, if possible.\n");
return speedstep_get_processor_frequency(SPEEDSTEP_PROCESSOR_PM);
}
if (c->x86 != 0xF) {
- printk(KERN_DEBUG PFX "Unknown p4-clockmod-capable CPU. Please send an e-mail to <linux@brodo.de>\n");
+ printk(KERN_WARNING PFX "Unknown p4-clockmod-capable CPU. Please send an e-mail to <linux@brodo.de>\n");
return 0;
}
if (speedstep_detect_processor() == SPEEDSTEP_PROCESSOR_P4M) {
- printk(KERN_DEBUG PFX "Warning: Pentium 4-M detected. The speedstep-ich or acpi cpufreq \n");
- printk(KERN_DEBUG PFX "modules offers voltage scaling in addition of frequency scaling. You\n");
- printk(KERN_DEBUG PFX "should use either one instead of p4-clockmod, if possible.\n");
+ printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
+ "The speedstep-ich or acpi cpufreq modules offers "
+ "voltage scaling in addition of frequency scaling. "
+ "You should use either one instead of p4-clockmod, "
+ "if possible.\n");
return speedstep_get_processor_frequency(SPEEDSTEP_PROCESSOR_P4M);
}
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2004-02-14 18:45 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-02-14 16:01 [PATCH >=2.6.4] single-line, but KERN_WARNING message in p4-clockmod Dominik Brodowski
2004-02-14 16:41 ` Dave Jones
2004-02-14 18:23 ` Dominik Brodowski
2004-02-14 18:29 ` Russell King
2004-02-14 18:45 ` Dominik Brodowski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.