Messages in this thread Patch in this message | | | From | Len Brown <> | Subject | [PATCH 8/8] SFI: expose IO-APIC routines to SFI, not just ACPI | Date | Tue, 23 Jun 2009 03:14:06 -0400 |
| |
From: Feng Tang <feng.tang@intel.com>
change condition from #ifdef CONFIG_ACPI to #if defined(CONFIG_ACPI) || defined(CONFIG_SFI)
for several io_apic related APIs which will be used by both ACPI and SFI.
this change will ensure the success kernel build whe CONFIG_SFI=y and CONFIG_ACPI=n
Signed-off-by: Feng Tang <feng.tang@intel.com> Signed-off-by: Len Brown <len.brown@intel.com> --- arch/x86/include/asm/io_apic.h | 4 ++-- arch/x86/kernel/apic/io_apic.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h index 9d826e4..2e5ff36 100644 --- a/arch/x86/include/asm/io_apic.h +++ b/arch/x86/include/asm/io_apic.h @@ -150,13 +150,13 @@ extern int timer_through_8259; #define io_apic_assign_pci_irqs \ (mp_irq_entries && !skip_ioapic_setup && io_apic_irqs) -#ifdef CONFIG_ACPI +#if defined(CONFIG_ACPI) || defined(CONFIG_SFI) extern int io_apic_get_unique_id(int ioapic, int apic_id); extern int io_apic_get_version(int ioapic); extern int io_apic_get_redir_entries(int ioapic); extern int io_apic_set_pci_routing(int ioapic, int pin, int irq, int edge_level, int active_high_low); -#endif /* CONFIG_ACPI */ +#endif /* CONFIG_ACPI || CONFIG_SFI */ extern int (*ioapic_renumber_irq)(int ioapic, int irq); extern void ioapic_init_mappings(void); diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 30da617..2705476 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -3904,7 +3904,7 @@ int __init arch_probe_nr_irqs(void) ACPI-based IOAPIC Configuration -------------------------------------------------------------------------- */ -#ifdef CONFIG_ACPI +#if defined(CONFIG_ACPI) || defined(CONFIG_SFI) #ifdef CONFIG_X86_32 int __init io_apic_get_unique_id(int ioapic, int apic_id) @@ -4045,7 +4045,7 @@ int acpi_get_override_irq(int bus_irq, int *trigger, int *polarity) return 0; } -#endif /* CONFIG_ACPI */ +#endif /* CONFIG_ACPI || CONFIG_SFI */ /* * This function currently is only a helper for the i386 smp boot process where -- 1.6.0.6
| |