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

Commit 80d16bac authored by Maciej W. Rozycki's avatar Maciej W. Rozycki Committed by Ingo Molnar
Browse files

x86: I/O APIC: remove redundant 8259A {,un}masking 



For a better control the masking and unmasking of the timer interrupt
line in the 8259A operating in the 'Virtual Wire' mode has been moved out
of setup_ExtINT_IRQ0_pin() now, so remove the redundant calls from the
function.

Signed-off-by: default avatarMaciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f0825262

arch/x86/kernel/io_apic_32.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -1310,8 +1310,6 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, in 




	memset(&entry,0,sizeof(entry));

	memset(&entry,0,sizeof(entry));





	disable_8259A_irq(0);



	/* mask LVT0 */

	/* mask LVT0 */

	apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT);

	apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT);
@@ -1337,8 +1335,6 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, in 
	 * Add it to the IO-APIC irq-routing table:

	 * Add it to the IO-APIC irq-routing table:

	 */

	 */

	ioapic_write_entry(apic, pin, entry);

	ioapic_write_entry(apic, pin, entry);



	enable_8259A_irq(0);

}

}





void __init print_IO_APIC(void)

void __init print_IO_APIC(void)

arch/x86/kernel/io_apic_64.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -906,8 +906,6 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, in 




	memset(&entry, 0, sizeof(entry));

	memset(&entry, 0, sizeof(entry));





	disable_8259A_irq(0);



	/* mask LVT0 */

	/* mask LVT0 */

	apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT);

	apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT);
@@ -933,8 +931,6 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, in 
	 * Add it to the IO-APIC irq-routing table:

	 * Add it to the IO-APIC irq-routing table:

	 */

	 */

	ioapic_write_entry(apic, pin, entry);

	ioapic_write_entry(apic, pin, entry);



	enable_8259A_irq(0);

}

}





void __apicdebuginit print_IO_APIC(void)

void __apicdebuginit print_IO_APIC(void)