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

Commit 42528795 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

Merge branches 'doc.2015.02.26a', 'earlycb.2015.03.03a', 'fixes.2015.03.03a',... 

Merge branches 'doc.2015.02.26a', 'earlycb.2015.03.03a', 'fixes.2015.03.03a', 'gpexp.2015.02.26a', 'hotplug.2015.03.20a', 'sysidle.2015.02.26b' and 'tiny.2015.02.26a' into HEAD

doc.2015.02.26a:  Documentation changes
earlycb.2015.03.03a:  Permit early-boot RCU callbacks
fixes.2015.03.03a:  Miscellaneous fixes
gpexp.2015.02.26a:  In-kernel expediting of normal grace periods
hotplug.2015.03.20a:  CPU hotplug fixes
sysidle.2015.02.26b:  NO_HZ_FULL_SYSIDLE fixes
tiny.2015.02.26a:  TINY_RCU fixes
parents ff382810 47627678 9910affa c136f991 654e9533 5871968d 915e8a4f

Documentation/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -2968,6 +2968,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			Set maximum number of finished RCU callbacks to

			process in one batch.



	rcutree.gp_init_delay=	[KNL]

			Set the number of jiffies to delay each step of

			RCU grace-period initialization.  This only has

			effect when CONFIG_RCU_TORTURE_TEST_SLOW_INIT is

			set.



	rcutree.rcu_fanout_leaf= [KNL]

			Increase the number of CPUs assigned to each

			leaf rcu_node structure.  Useful for very large

arch/blackfin/mach-common/smp.c

+2 −4
Original line number Diff line number Diff line
@@ -413,16 +413,14 @@ int __cpu_disable(void) 
	return 0;

}



static DECLARE_COMPLETION(cpu_killed);



int __cpu_die(unsigned int cpu)

{

	return wait_for_completion_timeout(&cpu_killed, 5000);

	return cpu_wait_death(cpu, 5);

}



void cpu_die(void)

{

	complete(&cpu_killed);

	(void)cpu_report_death();



	atomic_dec(&init_mm.mm_users);

	atomic_dec(&init_mm.mm_count);

arch/metag/kernel/smp.c

+2 −3
Original line number Diff line number Diff line
@@ -261,7 +261,6 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle) 
}



#ifdef CONFIG_HOTPLUG_CPU

static DECLARE_COMPLETION(cpu_killed);



/*

 * __cpu_disable runs on the processor to be shutdown.
@@ -299,7 +298,7 @@ int __cpu_disable(void) 
 */

void __cpu_die(unsigned int cpu)

{

	if (!wait_for_completion_timeout(&cpu_killed, msecs_to_jiffies(1)))

	if (!cpu_wait_death(cpu, 1))

		pr_err("CPU%u: unable to kill\n", cpu);

}
@@ -314,7 +313,7 @@ void cpu_die(void) 
	local_irq_disable();

	idle_task_exit();



	complete(&cpu_killed);

	(void)cpu_report_death();



	asm ("XOR	TXENABLE, D0Re0,D0Re0\n");

}

arch/x86/include/asm/cpu.h

+0 −2
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ extern int _debug_hotplug_cpu(int cpu, int action); 
#endif

#endif



DECLARE_PER_CPU(int, cpu_state);



int mwait_usable(const struct cpuinfo_x86 *);



#endif /* _ASM_X86_CPU_H */

arch/x86/include/asm/smp.h

+1 −1
Original line number Diff line number Diff line
@@ -150,12 +150,12 @@ static inline void arch_send_call_function_ipi_mask(const struct cpumask *mask) 
}



void cpu_disable_common(void);

void cpu_die_common(unsigned int cpu);

void native_smp_prepare_boot_cpu(void);

void native_smp_prepare_cpus(unsigned int max_cpus);

void native_smp_cpus_done(unsigned int max_cpus);

int native_cpu_up(unsigned int cpunum, struct task_struct *tidle);

int native_cpu_disable(void);

int common_cpu_die(unsigned int cpu);

void native_cpu_die(unsigned int cpu);

void native_play_dead(void);

void play_dead_common(void);