# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1196956198 0
# Node ID 582b6839f60a4ff6766cf4ba54fbdff056ec3da0
# Parent 95256f8bb7ca9825a6f4d28937186f478cffd56d
linux/x86: Reduce delta to native IO-APIC code.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
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 -r 95256f8bb7ca -r 582b6839f60a arch/i386/kernel/io_apic-xen.c
--- a/arch/i386/kernel/io_apic-xen.c Thu Dec 06 15:48:12 2007 +0000
+++ b/arch/i386/kernel/io_apic-xen.c Thu Dec 06 15:49:58 2007 +0000
@@ -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 -r 95256f8bb7ca -r 582b6839f60a arch/x86_64/kernel/io_apic-xen.c
--- a/arch/x86_64/kernel/io_apic-xen.c Thu Dec 06 15:48:12 2007 +0000
+++ b/arch/x86_64/kernel/io_apic-xen.c Thu Dec 06 15:49:58 2007 +0000
@@ -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 -r 95256f8bb7ca -r 582b6839f60a include/asm-i386/mach-xen/asm/hw_irq.h
--- a/include/asm-i386/mach-xen/asm/hw_irq.h Thu Dec 06 15:48:12 2007 +0000
+++ b/include/asm-i386/mach-xen/asm/hw_irq.h Thu Dec 06 15:49:58 2007 +0000
@@ -57,7 +57,7 @@ void init_VISWS_APIC_irqs(void);
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 -r 95256f8bb7ca -r 582b6839f60a include/asm-x86_64/mach-xen/asm/hw_irq.h
--- a/include/asm-x86_64/mach-xen/asm/hw_irq.h Thu Dec 06 15:48:12 2007 +0000
+++ b/include/asm-x86_64/mach-xen/asm/hw_irq.h Thu Dec 06 15:49:58 2007 +0000
@@ -97,7 +97,7 @@ extern void init_VISWS_APIC_irqs(void);
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);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home