diff options
author | Jiang Liu <jiang.liu@linux.intel.com> | 2014-10-27 04:12:04 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2014-12-16 08:08:17 -0500 |
commit | 8643e28da27d6d50f772409b8dc80bdab52239fb (patch) | |
tree | 032b4b2c9136b8f33e14c7e6c50fcba7982c4635 /arch/x86/include/asm/hw_irq.h | |
parent | c3468952f073a9d4efa1e60c04c6e640ed9cf9d0 (diff) |
x86, irq: Move IOAPIC related declarations from hw_irq.h into io_apic.h
Clean up code by moving IOAPIC related declarations from hw_irq.h into
io_apic.h.
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: H. Peter Anvin <hpa@linux.intel.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Baoquan He <bhe@redhat.com>
Cc: Matt Fleming <matt.fleming@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Christian Gmeiner <christian.gmeiner@gmail.com>
Cc: Aubrey <aubrey.li@linux.intel.com>
Cc: Ryan Desfosses <ryan@desfo.org>
Cc: Quentin Lambert <lambert.quentin@gmail.com>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: http://lkml.kernel.org/r/1414397531-28254-14-git-send-email-jiang.liu@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/include/asm/hw_irq.h')
-rw-r--r-- | arch/x86/include/asm/hw_irq.h | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h index a7235777a478..9662290e0b20 100644 --- a/arch/x86/include/asm/hw_irq.h +++ b/arch/x86/include/asm/hw_irq.h | |||
@@ -159,39 +159,6 @@ static inline void lock_vector_lock(void) {} | |||
159 | static inline void unlock_vector_lock(void) {} | 159 | static inline void unlock_vector_lock(void) {} |
160 | #endif /* CONFIG_X86_LOCAL_APIC */ | 160 | #endif /* CONFIG_X86_LOCAL_APIC */ |
161 | 161 | ||
162 | /* IOAPIC */ | ||
163 | #ifdef CONFIG_X86_IO_APIC | ||
164 | struct io_apic_irq_attr { | ||
165 | int ioapic; | ||
166 | int ioapic_pin; | ||
167 | int trigger; | ||
168 | int polarity; | ||
169 | }; | ||
170 | |||
171 | static inline void set_io_apic_irq_attr(struct io_apic_irq_attr *irq_attr, | ||
172 | int ioapic, int ioapic_pin, | ||
173 | int trigger, int polarity) | ||
174 | { | ||
175 | irq_attr->ioapic = ioapic; | ||
176 | irq_attr->ioapic_pin = ioapic_pin; | ||
177 | irq_attr->trigger = trigger; | ||
178 | irq_attr->polarity = polarity; | ||
179 | } | ||
180 | |||
181 | extern void setup_IO_APIC(void); | ||
182 | extern void enable_IO_APIC(void); | ||
183 | extern void disable_IO_APIC(void); | ||
184 | extern void setup_ioapic_dest(void); | ||
185 | extern int IO_APIC_get_PCI_irq_vector(int bus, int devfn, int pin); | ||
186 | extern void print_IO_APICs(void); | ||
187 | |||
188 | extern unsigned long io_apic_irqs; | ||
189 | #define IO_APIC_IRQ(x) (((x) >= NR_IRQS_LEGACY) || ((1 << (x)) & io_apic_irqs)) | ||
190 | #else /* CONFIG_X86_IO_APIC */ | ||
191 | #define IO_APIC_IRQ(x) 0 | ||
192 | static inline void print_IO_APICs(void) {} | ||
193 | #endif /* CONFIG_X86_IO_APIC */ | ||
194 | |||
195 | /* Statistics */ | 162 | /* Statistics */ |
196 | extern atomic_t irq_err_count; | 163 | extern atomic_t irq_err_count; |
197 | extern atomic_t irq_mis_count; | 164 | extern atomic_t irq_mis_count; |