parisc: Replace old style lock init in smp.c (6ad6c424) · Commits · 戴 / test

arch/parisc/kernel/smp.c

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -60,8 +60,6 @@ static int smp_debug_lvl = 0;
	#define smp_debug(lvl, ...) do { } while(0)		#define smp_debug(lvl, ...) do { } while(0)
	#endif /* DEBUG_SMP */		#endif /* DEBUG_SMP */

	DEFINE_SPINLOCK(smp_lock);

	volatile struct task_struct *smp_init_current_idle_task;		volatile struct task_struct *smp_init_current_idle_task;

	/* track which CPU is booting */		/* track which CPU is booting */
	@@ -69,7 +67,7 @@ static volatile int cpu_now_booting __cpuinitdata;

	static int parisc_max_cpus __cpuinitdata = 1;		static int parisc_max_cpus __cpuinitdata = 1;

	DEFINE_PER_CPU(spinlock_t, ipi_lock) = SPIN_LOCK_UNLOCKED;		static DEFINE_PER_CPU(spinlock_t, ipi_lock);

	enum ipi_message_type {		enum ipi_message_type {
	IPI_NOP=0,		IPI_NOP=0,
	@@ -438,6 +436,11 @@ void __init smp_prepare_boot_cpu(void)
	*/		*/
	void __init smp_prepare_cpus(unsigned int max_cpus)		void __init smp_prepare_cpus(unsigned int max_cpus)
	{		{
			int cpu;

			for_each_possible_cpu(cpu)
			spin_lock_init(&per_cpu(ipi_lock, cpu));

	init_cpu_present(cpumask_of(0));		init_cpu_present(cpumask_of(0));

	parisc_max_cpus = max_cpus;		parisc_max_cpus = max_cpus;