From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 23 Aug 2008 15:46:59 +0000 (+0200)
Subject: Merge branch 'x86/cpu' into x86/x2apic
X-Git-Tag: v2.6.28-rc1~711^2^2~44^2~1^2~5
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=87ce786ae5f24e336195805a9fc7428a6f922478;p=linux-2.6-omap-h63xx.git

Merge branch 'x86/cpu' into x86/x2apic
---

87ce786ae5f24e336195805a9fc7428a6f922478
diff --cc arch/x86/kernel/io_apic_64.c
index b9950dae59b,61a83b70c18..e63282e7886
--- a/arch/x86/kernel/io_apic_64.c
+++ b/arch/x86/kernel/io_apic_64.c
@@@ -898,18 -838,7 +911,10 @@@ void __setup_vector_irq(int cpu
  	}
  }
  
- void setup_vector_irq(int cpu)
- {
- 	spin_lock(&vector_lock);
- 	__setup_vector_irq(smp_processor_id());
- 	spin_unlock(&vector_lock);
- }
- 
- 
  static struct irq_chip ioapic_chip;
 +#ifdef CONFIG_INTR_REMAP
 +static struct irq_chip ir_ioapic_chip;
 +#endif
  
  static void ioapic_register_intr(int irq, unsigned long trigger)
  {