Commit 55acdddb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull smp/hotplug changes from Ingo Molnar:
 "Various cleanups to the SMP hotplug code - a continuing effort of
  Thomas et al"

* 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  smpboot: Remove leftover declaration
  smp: Remove num_booting_cpus()
  smp: Remove ipi_call_lock[_irq]()/ipi_call_unlock[_irq]()
  POWERPC: Smp: remove call to ipi_call_lock()/ipi_call_unlock()
  SPARC: SMP: Remove call to ipi_call_lock_irq()/ipi_call_unlock_irq()
  ia64: SMP: Remove call to ipi_call_lock_irq()/ipi_call_unlock_irq()
  x86-smp-remove-call-to-ipi_call_lock-ipi_call_unlock
  tile: SMP: Remove call to ipi_call_lock()/ipi_call_unlock()
  S390: Smp: remove call to ipi_call_lock()/ipi_call_unlock()
  parisc: Smp: remove call to ipi_call_lock()/ipi_call_unlock()
  mn10300: SMP: Remove call to ipi_call_lock()/ipi_call_unlock()
  hexagon: SMP: Remove call to ipi_call_lock()/ipi_call_unlock()
parents 2eafeb6a b871a42b

arch/hexagon/kernel/smp.c

+0 −2
Original line number Diff line number Diff line
@@ -180,9 +180,7 @@ void __cpuinit start_secondary(void) 


	notify_cpu_starting(cpu);



	ipi_call_lock();

	set_cpu_online(cpu, true);

	ipi_call_unlock();



	local_irq_enable();

arch/ia64/kernel/smpboot.c

+0 −2
Original line number Diff line number Diff line
@@ -382,7 +382,6 @@ smp_callin (void) 
	set_numa_node(cpu_to_node_map[cpuid]);

	set_numa_mem(local_memory_node(cpu_to_node_map[cpuid]));



	ipi_call_lock_irq();

	spin_lock(&vector_lock);

	/* Setup the per cpu irq handling data structures */

	__setup_vector_irq(cpuid);
@@ -390,7 +389,6 @@ smp_callin (void) 
	set_cpu_online(cpuid, true);

	per_cpu(cpu_state, cpuid) = CPU_ONLINE;

	spin_unlock(&vector_lock);

	ipi_call_unlock_irq();



	smp_setup_percpu_timer();

arch/m32r/include/asm/smp.h

+0 −5
Original line number Diff line number Diff line
@@ -79,11 +79,6 @@ static __inline__ int cpu_number_map(int cpu) 
	return cpu;

}



static __inline__ unsigned int num_booting_cpus(void)

{

	return cpumask_weight(&cpu_callout_map);

}



extern void smp_send_timer(void);

extern unsigned long send_IPI_mask_phys(const cpumask_t*, int, int);

arch/mn10300/kernel/smp.c

+0 −2
Original line number Diff line number Diff line
@@ -876,9 +876,7 @@ static void __init smp_online(void) 


	notify_cpu_starting(cpu);



	ipi_call_lock();

	set_cpu_online(cpu, true);

	ipi_call_unlock();



	local_irq_enable();

}

arch/parisc/kernel/smp.c

+0 −2
Original line number Diff line number Diff line
@@ -300,9 +300,7 @@ smp_cpu_init(int cpunum) 


	notify_cpu_starting(cpunum);



	ipi_call_lock();

	set_cpu_online(cpunum, true);

	ipi_call_unlock();



	/* Initialise the idle task for this CPU */

	atomic_inc(&init_mm.mm_count);

CRA Git | Maintained and supported by SUSTech CRA and CCSE