--- zzzz-none-000/linux-2.6.19.2/arch/x86_64/kernel/smpboot.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/arch/x86_64/kernel/smpboot.c	2007-01-11 07:38:19.000000000 +0000
@@ -581,16 +581,12 @@
 	 * smp_call_function().
 	 */
 	lock_ipi_call_lock();
-	spin_lock(&vector_lock);
 
-	/* Setup the per cpu irq handling data structures */
-	__setup_vector_irq(smp_processor_id());
 	/*
 	 * Allow the master to continue.
 	 */
 	cpu_set(smp_processor_id(), cpu_online_map);
 	per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE;
-	spin_unlock(&vector_lock);
 	unlock_ipi_call_lock();
 
 	cpu_idle();
@@ -803,6 +799,7 @@
 				cpu, node);
 	}
 
+
 	alternatives_smp_switch(1);
 
 	c_idle.idle = get_idle_for_cpu(cpu);
@@ -1249,10 +1246,8 @@
 	local_irq_disable();
 	remove_siblinginfo(cpu);
 
-	spin_lock(&vector_lock);
 	/* It's now safe to remove this processor from the online map */
 	cpu_clear(cpu, cpu_online_map);
-	spin_unlock(&vector_lock);
 	remove_cpu_from_maps();
 	fixup_irqs(cpu_online_map);
 	return 0;