Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33c053d0 authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar
Browse files

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: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 2c460d0b

arch/x86/kernel/time_32.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

}

arch/x86/kernel/time_64.c

+8 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/interrupt.h>

#include <linux/module.h>

#include <linux/time.h>

#include <linux/mca.h>



#include <asm/i8253.h>

#include <asm/hpet.h>
@@ -54,6 +55,13 @@ irqreturn_t timer_interrupt(int irq, void *dev_id) 


	global_clock_event->event_handler(global_clock_event);



#ifdef CONFIG_MCA

	if (MCA_bus) {

		u8 irq_v = inb_p(0x61);       /* read the current state */

		outb_p(irq_v|0x80, 0x61);     /* reset the IRQ */

	}

#endif



	return IRQ_HANDLED;

}