diff options
| author | Ingo Molnar <mingo@elte.hu> | 2004-06-17 18:00:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-17 18:00:30 -0700 |
| commit | 2765df29514dbed2554e0e0c64aafdbdbbf2582a (patch) | |
| tree | 9a4b57e4f0e70a545b144d24e69a1a261b2527a8 | |
| parent | ecab05038f0dfa0a74837f701ac26750771c1c1b (diff) | |
| download | history-2765df29514dbed2554e0e0c64aafdbdbbf2582a.tar.gz | |
[PATCH] x86: remove io_apic_sync
The patch below gets rid of io_apic_sync().
io_apic_sync() was introduced in 2.1.104 and it was originally done for
masking and unmasking as well. Later the unmasking use got removed but the
masking use lingered around. I dont think it was ever justified to do it
and clearly since the lack of io_apic_sync() didnt break some of the other
writes we do to the IO-APIC registers, it must be unnecessary in the
masking case too.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/i386/kernel/io_apic.c | 3 | ||||
| -rw-r--r-- | include/asm-i386/io_apic.h | 9 |
2 files changed, 0 insertions, 12 deletions
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c index 511f933957b54..602006bb3d4a9 100644 --- a/arch/i386/kernel/io_apic.c +++ b/arch/i386/kernel/io_apic.c @@ -145,10 +145,7 @@ static void __modify_IO_APIC_irq (unsigned int irq, unsigned long enable, unsign /* mask = 1 */ static void __mask_IO_APIC_irq (unsigned int irq) { - struct irq_pin_list *entry = irq_2_pin + irq; __modify_IO_APIC_irq(irq, 0x00010000, 0); - /* Is it needed? Or do others need it too? */ - io_apic_sync(entry->apic); } /* mask = 0 */ diff --git a/include/asm-i386/io_apic.h b/include/asm-i386/io_apic.h index 861eceefc5aa5..37b969fe7f133 100644 --- a/include/asm-i386/io_apic.h +++ b/include/asm-i386/io_apic.h @@ -188,15 +188,6 @@ static inline void io_apic_modify(unsigned int apic, unsigned int reg, unsigned *(IO_APIC_BASE(apic)+4) = value; } -/* - * Synchronize the IO-APIC and the CPU by doing - * a dummy read from the IO-APIC - */ -static inline void io_apic_sync(unsigned int apic) -{ - (void) *(IO_APIC_BASE(apic)+4); -} - /* 1 if "noapic" boot option passed */ extern int skip_ioapic_setup; |