From: tip-bot for Eric W. Biederman on
Commit-ID: 4f47b4c9f0b711bf84adb8c27774ae80d346b628
Gitweb: http://git.kernel.org/tip/4f47b4c9f0b711bf84adb8c27774ae80d346b628
Author: Eric W. Biederman <ebiederm(a)xmission.com>
AuthorDate: Wed, 5 May 2010 13:22:25 -0700
Committer: Ingo Molnar <mingo(a)elte.hu>
CommitDate: Thu, 6 May 2010 08:17:51 +0200

x86, acpi/irq: Define gsi_end when X86_IO_APIC is undefined

My recent changes introducing a global gsi_end variable
failed to take into account the case of using acpi on a system
not built to support IO_APICs, causing the build to fail.

Define gsi_end to 15 when CONFIG_X86_IO_APIC is not set to avoid
compile errors.

Signed-off-by: Eric W. Biederman <ebiederm(a)xmission.com>
Cc: Yinghai Lu <yinghai(a)kernel.org>
LKML-Reference: <m1tyqm14la.fsf_-_(a)fess.ebiederm.org>
Signed-off-by: Ingo Molnar <mingo(a)elte.hu>
---
arch/x86/include/asm/io_apic.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h
index 9da192a..63cb409 100644
--- a/arch/x86/include/asm/io_apic.h
+++ b/arch/x86/include/asm/io_apic.h
@@ -197,6 +197,7 @@ static const int timer_through_8259 = 0;
static inline void ioapic_init_mappings(void) { }
static inline void ioapic_insert_resources(void) { }
static inline void probe_nr_irqs_gsi(void) { }
+#define gsi_end (NR_IRQS_LEGACY - 1)
static inline int mp_find_ioapic(u32 gsi) { return 0; }

struct io_apic_irq_attr;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/