[patch] x86_64: fix orphaned bits of timer init messages

[patch] x86_64: fix orphaned bits of timer init messages

[Chuck Ebbert]

When x86_64 timer init messages were changed to use apic verbosity
levels, two messages were missed and one got the wrong level. This
causes the last word of a suppressed message to print on a line
by itself.  Fix that so either the entire message prints or none
of it does.

Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com>

--- 2.6.16-rc5-64.orig/arch/x86_64/kernel/io_apic.c
+++ 2.6.16-rc5-64/arch/x86_64/kernel/io_apic.c
@@ -1848,7 +1848,7 @@ static inline void check_timer(void)
 		 */
 		setup_ExtINT_IRQ0_pin(apic2, pin2, vector);
 		if (timer_irq_works()) {
-			printk("works.\n");
+			apic_printk(APIC_VERBOSE," works.\n");
 			nmi_watchdog_default();
 			if (nmi_watchdog == NMI_IO_APIC) {
 				setup_nmi();
@@ -1860,7 +1860,7 @@ static inline void check_timer(void)
 		 */
 		clear_IO_APIC_pin(apic2, pin2);
 	}
-	printk(" failed.\n");
+	apic_printk(APIC_VERBOSE," failed.\n");
 
 	if (nmi_watchdog == NMI_IO_APIC) {
 		printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n");
@@ -1875,7 +1875,7 @@ static inline void check_timer(void)
 	enable_8259A_irq(0);
 
 	if (timer_irq_works()) {
-		apic_printk(APIC_QUIET, " works.\n");
+		apic_printk(APIC_VERBOSE," works.\n");
 		return;
 	}
 	apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_FIXED | vector);
-- 
Chuck
"Equations are the Devil's sentences."  --Stephen Colbert

Re: [patch] x86_64: fix orphaned bits of timer init messages

[Andi Kleen]

On Tuesday 28 February 2006 22:01, Chuck Ebbert wrote:
> When x86_64 timer init messages were changed to use apic verbosity
> levels, two messages were missed and one got the wrong level. This
> causes the last word of a suppressed message to print on a line
> by itself.  Fix that so either the entire message prints or none
> of it does.

Applied thanks - although I plan to kill most of check_timer soon anyways.
So don't put too much effort into it right now.

-Andi