diff options
author | Maciej W. Rozycki <macro@linux-mips.org> | 2008-05-27 16:19:22 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 03:13:02 -0400 |
commit | 80d16bace63e057d30337e48d70aef0881656457 (patch) | |
tree | 76cede6b68474755fa257758c17c784164d80b53 /arch/x86/kernel | |
parent | f08252623c7981f5cea70e4fab4983a94fc52212 (diff) |
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: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/io_apic_32.c | 4 | ||||
-rw-r--r-- | arch/x86/kernel/io_apic_64.c | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c index c93c0d3c1a6b..6e743ecf863b 100644 --- a/arch/x86/kernel/io_apic_32.c +++ b/arch/x86/kernel/io_apic_32.c | |||
@@ -1310,8 +1310,6 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, in | |||
1310 | 1310 | ||
1311 | memset(&entry,0,sizeof(entry)); | 1311 | memset(&entry,0,sizeof(entry)); |
1312 | 1312 | ||
1313 | disable_8259A_irq(0); | ||
1314 | |||
1315 | /* mask LVT0 */ | 1313 | /* mask LVT0 */ |
1316 | apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); | 1314 | apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); |
1317 | 1315 | ||
@@ -1337,8 +1335,6 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, in | |||
1337 | * Add it to the IO-APIC irq-routing table: | 1335 | * Add it to the IO-APIC irq-routing table: |
1338 | */ | 1336 | */ |
1339 | ioapic_write_entry(apic, pin, entry); | 1337 | ioapic_write_entry(apic, pin, entry); |
1340 | |||
1341 | enable_8259A_irq(0); | ||
1342 | } | 1338 | } |
1343 | 1339 | ||
1344 | void __init print_IO_APIC(void) | 1340 | void __init print_IO_APIC(void) |
diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c index 2a60bfb7446f..83d4e117746b 100644 --- a/arch/x86/kernel/io_apic_64.c +++ b/arch/x86/kernel/io_apic_64.c | |||
@@ -906,8 +906,6 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, in | |||
906 | 906 | ||
907 | memset(&entry, 0, sizeof(entry)); | 907 | memset(&entry, 0, sizeof(entry)); |
908 | 908 | ||
909 | disable_8259A_irq(0); | ||
910 | |||
911 | /* mask LVT0 */ | 909 | /* mask LVT0 */ |
912 | apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); | 910 | apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); |
913 | 911 | ||
@@ -933,8 +931,6 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, in | |||
933 | * Add it to the IO-APIC irq-routing table: | 931 | * Add it to the IO-APIC irq-routing table: |
934 | */ | 932 | */ |
935 | ioapic_write_entry(apic, pin, entry); | 933 | ioapic_write_entry(apic, pin, entry); |
936 | |||
937 | enable_8259A_irq(0); | ||
938 | } | 934 | } |
939 | 935 | ||
940 | void __apicdebuginit print_IO_APIC(void) | 936 | void __apicdebuginit print_IO_APIC(void) |