Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b364e2f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Prevent sparc64 from invoking irq handlers on offline CPUs
  sparc64: Fix IPI call locking.
parents 06dd881f 4d084617

arch/sparc64/kernel/smp.c

+6 −8
Original line number Original line Diff line number Diff line
@@ -80,8 +80,6 @@ void smp_bogo(struct seq_file *m) 
			   i, cpu_data(i).clock_tick);

			   i, cpu_data(i).clock_tick);

}

}





static __cacheline_aligned_in_smp DEFINE_SPINLOCK(call_lock);



extern void setup_sparc64_timer(void);

extern void setup_sparc64_timer(void);





static volatile unsigned long callin_flag = 0;

static volatile unsigned long callin_flag = 0;
@@ -120,9 +118,9 @@ void __cpuinit smp_callin(void) 
	while (!cpu_isset(cpuid, smp_commenced_mask))

	while (!cpu_isset(cpuid, smp_commenced_mask))

		rmb();

		rmb();





	spin_lock(&call_lock);

	ipi_call_lock();

	cpu_set(cpuid, cpu_online_map);

	cpu_set(cpuid, cpu_online_map);

	spin_unlock(&call_lock);

	ipi_call_unlock();





	/* idle thread is expected to have preempt disabled */

	/* idle thread is expected to have preempt disabled */

	preempt_disable();

	preempt_disable();
@@ -1305,10 +1303,6 @@ int __cpu_disable(void) 
	c->core_id = 0;

	c->core_id = 0;

	c->proc_id = -1;

	c->proc_id = -1;





	spin_lock(&call_lock);

	cpu_clear(cpu, cpu_online_map);

	spin_unlock(&call_lock);



	smp_wmb();

	smp_wmb();





	/* Make sure no interrupts point to this cpu.  */

	/* Make sure no interrupts point to this cpu.  */
@@ -1318,6 +1312,10 @@ int __cpu_disable(void) 
	mdelay(1);

	mdelay(1);

	local_irq_disable();

	local_irq_disable();





	ipi_call_lock();

	cpu_clear(cpu, cpu_online_map);

	ipi_call_unlock();



	return 0;

	return 0;

}

}