lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: Remove mca bus ifdef from timer interrupt

Browse Source 
MCA_bus is constant 0 when CONFIG_MCA=n. So the compiler removes that
code w/o needing an extra #ifdef

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner
2009-08-20 15:59:35 +02:00
parent 64fcbac1f3
commit 0be6939422
2 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
arch/x86/kernel/time_32.c
View File

@@ -78,21 +78,9 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)
global_clock_event->event_handler(global_clock_event); global_clock_event->event_handler(global_clock_event);
#ifdef CONFIG_MCA /* MCA bus quirk: Acknowledge irq0 by setting bit 7 in port 0x61 */
if (MCA_bus) { if (MCA_bus)
/* The PS/2 uses level-triggered interrupts. You can't outb_p(inb_p(0x61)| 0x80, 0x61);
turn them off, nor would you want to (any attempt to
enable edge-triggered interrupts usually gets intercepted by a
special hardware circuit). Hence we have to acknowledge
the timer interrupt. Through some incredibly stupid
design idea, the reset for IRQ 0 is done by setting the
high bit of the PPI port B (0x61). Note that some PS/2s,
notably the 55SX, work fine if this is removed. */
u8 irq_v = inb_p(0x61); /* read the current state */
outb_p(irq_v | 0x80, 0x61); /* reset the IRQ */
}
#endif
return IRQ_HANDLED; return IRQ_HANDLED;
} }

9
arch/x86/kernel/time_64.c
View File

@@ -67,12 +67,9 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)
global_clock_event->event_handler(global_clock_event); global_clock_event->event_handler(global_clock_event);
#ifdef CONFIG_MCA /* MCA bus quirk: Acknowledge irq0 by setting bit 7 in port 0x61 */
if (MCA_bus) { if (MCA_bus)
u8 irq_v = inb_p(0x61); /* read the current state */ outb_p(inb_p(0x61)| 0x80, 0x61);
outb_p(irq_v|0x80, 0x61); /* reset the IRQ */
}
#endif
return IRQ_HANDLED; return IRQ_HANDLED;
} }