summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/io_apic_32.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2008-08-09 15:09:02 -0700
committerIngo Molnar <mingo@elte.hu>2008-08-11 10:37:34 +0200
commitd388e5fdc461344d04307a3fa83862b9ed429647 (patch)
tree61a9a4311b165038423a0f3412e93b8811796c6b /arch/x86/kernel/io_apic_32.c
parent31343d8a5079cda57ffd539fcf4f00cea344fe98 (diff)
downloadop-kernel-dev-d388e5fdc461344d04307a3fa83862b9ed429647.zip
op-kernel-dev-d388e5fdc461344d04307a3fa83862b9ed429647.tar.gz
x86: Restore proper vector locking during cpu hotplug
Having cpu_online_map change during assign_irq_vector can result in some really nasty and weird things happening. The one that bit me last time was accessing non existent per cpu memory for non existent cpus. This locking was removed in a sloppy x86_64 and x86_32 merge patch. Guys can we please try and avoid subtly breaking x86 when we are merging files together? Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/io_apic_32.c')
-rw-r--r--arch/x86/kernel/io_apic_32.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c
index de9aa0e..09cddb5 100644
--- a/arch/x86/kernel/io_apic_32.c
+++ b/arch/x86/kernel/io_apic_32.c
@@ -57,7 +57,7 @@ atomic_t irq_mis_count;
static struct { int pin, apic; } ioapic_i8259 = { -1, -1 };
static DEFINE_SPINLOCK(ioapic_lock);
-static DEFINE_SPINLOCK(vector_lock);
+DEFINE_SPINLOCK(vector_lock);
int timer_through_8259 __initdata;
@@ -1209,10 +1209,6 @@ static int assign_irq_vector(int irq)
return vector;
}
-void setup_vector_irq(int cpu)
-{
-}
-
static struct irq_chip ioapic_chip;
#define IOAPIC_AUTO -1
OpenPOWER on IntegriCloud