aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-23 13:54:53 -0500
committerThomas Gleixner <tglx@linutronix.de>2011-02-23 13:58:09 -0500
commitabb0052289e58140d933b29491f59e4be0a19727 (patch)
tree37318c7f0c897f1346db933d469b4fffaa084aec
parent710dcda64369e3f3704a0eee502ce27dbf9fedc1 (diff)
x86: ioapic: Move trigger defines to io_apic.h
Required for devicetree based io_apic configuration. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/include/asm/io_apic.h4
-rw-r--r--arch/x86/kernel/apic/io_apic.c4
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 be61e22dd9ea..c4bd267dfc50 100644
--- a/arch/x86/include/asm/io_apic.h
+++ b/arch/x86/include/asm/io_apic.h
@@ -95,6 +95,10 @@ struct IR_IO_APIC_route_entry {
95 index : 15; 95 index : 15;
96} __attribute__ ((packed)); 96} __attribute__ ((packed));
97 97
98#define IOAPIC_AUTO -1
99#define IOAPIC_EDGE 0
100#define IOAPIC_LEVEL 1
101
98#ifdef CONFIG_X86_IO_APIC 102#ifdef CONFIG_X86_IO_APIC
99 103
100/* 104/*
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 46913ef88ea4..8d23e831a45e 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -1216,10 +1216,6 @@ void __setup_vector_irq(int cpu)
1216static struct irq_chip ioapic_chip; 1216static struct irq_chip ioapic_chip;
1217static struct irq_chip ir_ioapic_chip; 1217static struct irq_chip ir_ioapic_chip;
1218 1218
1219#define IOAPIC_AUTO -1
1220#define IOAPIC_EDGE 0
1221#define IOAPIC_LEVEL 1
1222
1223#ifdef CONFIG_X86_32 1219#ifdef CONFIG_X86_32
1224static inline int IO_APIC_irq_trigger(int irq) 1220static inline int IO_APIC_irq_trigger(int irq)
1225{ 1221{