From 307841e3cb48db290d5110ebf02f1ae93868c5de Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 6 Dec 2007 15:49:58 +0000 Subject: [PATCH] linux/x86: Reduce delta to native IO-APIC code. Signed-off-by: Jan Beulich --- arch/i386/kernel/io_apic-xen.c | 7 ------- arch/x86_64/kernel/io_apic-xen.c | 7 ------- include/asm-i386/mach-xen/asm/hw_irq.h | 2 +- include/asm-x86_64/mach-xen/asm/hw_irq.h | 2 +- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/arch/i386/kernel/io_apic-xen.c b/arch/i386/kernel/io_apic-xen.c index 8d50b28d..f673f7c4 100644 --- a/arch/i386/kernel/io_apic-xen.c +++ b/arch/i386/kernel/io_apic-xen.c @@ -1538,8 +1538,6 @@ void __init print_IO_APIC(void) return; } -#if 0 - static void print_APIC_bitfield (int base) { unsigned int v; @@ -1680,11 +1678,6 @@ void /*__init*/ print_PIC(void) v = inb(0x4d1) << 8 | inb(0x4d0); printk(KERN_DEBUG "... PIC ELCR: %04x\n", v); } - -#endif /* 0 */ - -#else -void __init print_IO_APIC(void) { } #endif /* !CONFIG_XEN */ static void __init enable_IO_APIC(void) diff --git a/arch/x86_64/kernel/io_apic-xen.c b/arch/x86_64/kernel/io_apic-xen.c index c1f5172d..5cce79b1 100644 --- a/arch/x86_64/kernel/io_apic-xen.c +++ b/arch/x86_64/kernel/io_apic-xen.c @@ -1186,8 +1186,6 @@ void __apicdebuginit print_IO_APIC(void) return; } -#if 0 - static __apicdebuginit void print_APIC_bitfield (int base) { unsigned int v; @@ -1322,11 +1320,6 @@ void __apicdebuginit print_PIC(void) v = inb(0x4d1) << 8 | inb(0x4d0); printk(KERN_DEBUG "... PIC ELCR: %04x\n", v); } - -#endif /* 0 */ - -#else -void __init print_IO_APIC(void) { } #endif /* !CONFIG_XEN */ static void __init enable_IO_APIC(void) diff --git a/include/asm-i386/mach-xen/asm/hw_irq.h b/include/asm-i386/mach-xen/asm/hw_irq.h index 87e5a351..c75d1543 100644 --- a/include/asm-i386/mach-xen/asm/hw_irq.h +++ b/include/asm-i386/mach-xen/asm/hw_irq.h @@ -57,7 +57,7 @@ void FASTCALL(send_IPI_self(int vector)); void init_VISWS_APIC_irqs(void); void setup_IO_APIC(void); void disable_IO_APIC(void); -void print_IO_APIC(void); +#define print_IO_APIC() int IO_APIC_get_PCI_irq_vector(int bus, int slot, int fn); void send_IPI(int dest, int vector); void setup_ioapic_dest(void); diff --git a/include/asm-x86_64/mach-xen/asm/hw_irq.h b/include/asm-x86_64/mach-xen/asm/hw_irq.h index 3ce0bbc1..4990f4c9 100644 --- a/include/asm-x86_64/mach-xen/asm/hw_irq.h +++ b/include/asm-x86_64/mach-xen/asm/hw_irq.h @@ -97,7 +97,7 @@ extern void FASTCALL(send_IPI_self(int vector)); extern void init_VISWS_APIC_irqs(void); extern void setup_IO_APIC(void); extern void disable_IO_APIC(void); -extern void print_IO_APIC(void); +#define print_IO_APIC() extern int IO_APIC_get_PCI_irq_vector(int bus, int slot, int fn); extern void send_IPI(int dest, int vector); extern void setup_ioapic_dest(void); -- 2.39.5