summary refs log tree commit diff
path: root/arch/x86/kernel/time_32.c
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-07-21 18:42:52 -0300
committerIngo Molnar <mingo@elte.hu>2008-10-13 10:21:47 +0200
commit33c053d0aec344c8b2ad6966d904ebeff64e590b (patch)
tree4c5688f392c8a762c83a55be8e9401432e28eab1 /arch/x86/kernel/time_32.c
parent2c460d0b6813a5d2a7d571b0b561e4e727036dd7 (diff)
downloadlinux-33c053d0aec344c8b2ad6966d904ebeff64e590b.tar.gz
x86: wrap MCA_bus test around an ifdef
Only test for MCA_bus if support for MCA is compiled in.
Also, for x86_64, write the code inside the conditional
for consistency with i386. It won't bite us, since it'll
probably never select CONFIG_MCA anyway.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/time_32.c')
-rw-r--r--arch/x86/kernel/time_32.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/time_32.c b/arch/x86/kernel/time_32.c
index 7215bc6adfcc..77b400f06ea2 100644
--- a/arch/x86/kernel/time_32.c
+++ b/arch/x86/kernel/time_32.c
@@ -94,6 +94,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id)
 
 	do_timer_interrupt_hook();
 
+#ifdef CONFIG_MCA
 	if (MCA_bus) {
 		/* The PS/2 uses level-triggered interrupts.  You can't
 		turn them off, nor would you want to (any attempt to
@@ -107,6 +108,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id)
 		u8 irq_v = inb_p( 0x61 );	/* read the current state */
 		outb_p( irq_v|0x80, 0x61 );	/* reset the IRQ */
 	}
+#endif
 
 	return IRQ_HANDLED;
 }