Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=81fe96bde7db24c02adf245604f073ea9e8d941a
Commit:     81fe96bde7db24c02adf245604f073ea9e8d941a
Parent:     752097cec53eea111d087c545179b421e2bde98a
Author:     Avi Kivity <[EMAIL PROTECTED]>
AuthorDate: Thu Sep 27 10:07:04 2007 +0200
Committer:  Avi Kivity <[EMAIL PROTECTED]>
CommitDate: Sat Oct 13 10:18:17 2007 +0200

    i386: Expose IOAPIC register definitions even if CONFIG_X86_IO_APIC is not 
set
    
    KVM reuses the IOAPIC register definitions, and needs them even if the
    host is not compiled with IOAPIC support.  Move the #ifdef below so that 
only
    the IOAPIC variables and functions are protected, and the register 
definitions
    are available to all.
    
    Signed-off-by: Avi Kivity <[EMAIL PROTECTED]>
---
 include/asm-x86/io_apic_32.h |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/asm-x86/io_apic_32.h b/include/asm-x86/io_apic_32.h
index dbe734d..3f08788 100644
--- a/include/asm-x86/io_apic_32.h
+++ b/include/asm-x86/io_apic_32.h
@@ -11,8 +11,6 @@
  * Copyright (C) 1997, 1998, 1999, 2000 Ingo Molnar
  */
 
-#ifdef CONFIG_X86_IO_APIC
-
 /*
  * The structure of the IO-APIC:
  */
@@ -55,12 +53,6 @@ union IO_APIC_reg_03 {
        } __attribute__ ((packed)) bits;
 };
 
-/*
- * # of IO-APICs and # of IRQ routing registers
- */
-extern int nr_ioapics;
-extern int nr_ioapic_registers[MAX_IO_APICS];
-
 enum ioapic_irq_destination_types {
        dest_Fixed = 0,
        dest_LowestPrio = 1,
@@ -100,6 +92,14 @@ struct IO_APIC_route_entry {
 
 } __attribute__ ((packed));
 
+#ifdef CONFIG_X86_IO_APIC
+
+/*
+ * # of IO-APICs and # of IRQ routing registers
+ */
+extern int nr_ioapics;
+extern int nr_ioapic_registers[MAX_IO_APICS];
+
 /*
  * MP-BIOS irq configuration table structures:
  */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to