View | Details | Raw Unified | Return to bug 68291 | Differences between
and this patch

Collapse All | Expand All

(-)a/arch/x86/kernel/apic/io_apic.c (-4 / +3 lines)
Lines 129-134 DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES); Link Here
129
129
130
int skip_ioapic_setup;
130
int skip_ioapic_setup;
131
131
132
static struct irq_chip ioapic_chip;
133
132
/**
134
/**
133
 * disable_ioapic_support() - disables ioapic support at runtime
135
 * disable_ioapic_support() - disables ioapic support at runtime
134
 */
136
 */
Lines 266-272 static struct irq_cfg *alloc_irq_and_cfg_at(unsigned int at, int node) Link Here
266
	struct irq_cfg *cfg;
268
	struct irq_cfg *cfg;
267
269
268
	if (res < 0) {
270
	if (res < 0) {
269
		if (res != -EEXIST)
271
		if (res != -EEXIST || irq_get_chip(at) != &ioapic_chip)
270
			return NULL;
272
			return NULL;
271
		cfg = irq_get_chip_data(at);
273
		cfg = irq_get_chip_data(at);
272
		if (cfg)
274
		if (cfg)
Lines 1235-1242 void __setup_vector_irq(int cpu) Link Here
1235
	raw_spin_unlock(&vector_lock);
1237
	raw_spin_unlock(&vector_lock);
1236
}
1238
}
1237
1239
1238
static struct irq_chip ioapic_chip;
1239
1240
#ifdef CONFIG_X86_32
1240
#ifdef CONFIG_X86_32
1241
static inline int IO_APIC_irq_trigger(int irq)
1241
static inline int IO_APIC_irq_trigger(int irq)
1242
{
1242
{
1243
- 

Return to bug 68291