Re: [2.6.4-rc2] bogus semicolon behind if()

[Maciej W. Rozycki]

On Wed, 10 Mar 2004, Philippe Elie wrote:

> > As I wrote a few days ago I have problems with that ChangeSet,
> >   (http://marc.theaimsgroup.com/?l=linux-kernel&m=107840458123059&w=2)
> > so I did examine it closer.
> 
> errmm, http://tinyurl.com/2jbe4
> 
> Maciej, you wrote this patch, any comment ?

 Yep, that's a stupid typo, but the bug would only trigger for a system
that would have:

1. a discrete 82489DX APIC,

2. a functional TSC,

3. a timer interrupt working through the I/O APIC,

4. a working I/O APIC NMI watchdog.

Such systems used to actually exist, but you'd have a hard time trying to
find one.

 Here's an obvious update.  Thomas, thanks for spotting it.

  Maciej

-- 
+  Maciej W. Rozycki, Technical University of Gdansk, Poland   +
+--------------------------------------------------------------+
+        e-mail: macro@xxxxxxxxxxxxx, PGP key available        +

patch-2.6.4-timer_ack-fix-0
diff -up --recursive --new-file linux-2.6.4.macro/arch/i386/kernel/io_apic.c linux-2.6.4/arch/i386/kernel/io_apic.c
--- linux-2.6.4.macro/arch/i386/kernel/io_apic.c	2004-03-17 17:09:29.000000000 +0000
+++ linux-2.6.4/arch/i386/kernel/io_apic.c	2004-03-17 17:11:07.000000000 +0000
@@ -2195,7 +2195,7 @@ static inline void check_timer(void)
 				disable_8259A_irq(0);
 				setup_nmi();
 				enable_8259A_irq(0);
-				if (check_nmi_watchdog() < 0);
+				if (check_nmi_watchdog() < 0)
 					timer_ack = !cpu_has_tsc;
 			}
 			return;
@@ -2219,7 +2219,7 @@ static inline void check_timer(void)
 				add_pin_to_irq(0, 0, pin2);
 			if (nmi_watchdog == NMI_IO_APIC) {
 				setup_nmi();
-				if (check_nmi_watchdog() < 0);
+				if (check_nmi_watchdog() < 0)
 					timer_ack = !cpu_has_tsc;
 			}
 			return;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/