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

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

Merge branches 'doc.2016.08.22c', 'exp.2016.08.22c', 'fixes.2016.09.14a',... 

Merge branches 'doc.2016.08.22c', 'exp.2016.08.22c', 'fixes.2016.09.14a', 'hotplug.2016.08.22c' and 'torture.2016.08.22c' into HEAD

doc.2016.08.22c: Documentation updates
exp.2016.08.22c: Expedited grace-period updates
fixes.2016.09.14a: Miscellaneous fixes
hotplug.2016.08.22c: CPU-hotplug changes
torture.2016.08.22c: Torture-test changes
parents ed2bec07 385c859f 12adfd88 0ffd374b 489bb3d2

include/linux/list.h

+5 −2
Original line number Diff line number Diff line
@@ -381,8 +381,11 @@ static inline void list_splice_tail_init(struct list_head *list, 
 *

 * Note that if the list is empty, it returns NULL.

 */

#define list_first_entry_or_null(ptr, type, member) \

	(!list_empty(ptr) ? list_first_entry(ptr, type, member) : NULL)

#define list_first_entry_or_null(ptr, type, member) ({ \

	struct list_head *head__ = (ptr); \

	struct list_head *pos__ = READ_ONCE(head__->next); \

	pos__ != head__ ? list_entry(pos__, type, member) : NULL; \

})



/**

 * list_next_entry - get the next element in list

include/linux/rcupdate.h

+1 −0
Original line number Diff line number Diff line
@@ -334,6 +334,7 @@ void rcu_sched_qs(void); 
void rcu_bh_qs(void);

void rcu_check_callbacks(int user);

void rcu_report_dead(unsigned int cpu);

void rcu_cpu_starting(unsigned int cpu);



#ifndef CONFIG_TINY_RCU

void rcu_end_inkernel_boot(void);

include/linux/torture.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 


#define TORTURE_FLAG "-torture:"

#define TOROUT_STRING(s) \

	pr_alert("%s" TORTURE_FLAG s "\n", torture_type)

	pr_alert("%s" TORTURE_FLAG " %s\n", torture_type, s)

#define VERBOSE_TOROUT_STRING(s) \

	do { if (verbose) pr_alert("%s" TORTURE_FLAG " %s\n", torture_type, s); } while (0)

#define VERBOSE_TOROUT_ERRSTRING(s) \

kernel/cpu.c

+1 −0
Original line number Diff line number Diff line
@@ -889,6 +889,7 @@ void notify_cpu_starting(unsigned int cpu) 
	struct cpuhp_cpu_state *st = per_cpu_ptr(&cpuhp_state, cpu);

	enum cpuhp_state target = min((int)st->target, CPUHP_AP_ONLINE);



	rcu_cpu_starting(cpu);	/* Enables RCU usage on this CPU. */

	while (st->state < target) {

		struct cpuhp_step *step;

kernel/rcu/rcuperf.c

+3 −4
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ MODULE_AUTHOR("Paul E. McKenney <paulmck@linux.vnet.ibm.com>"); 


#define PERF_FLAG "-perf:"

#define PERFOUT_STRING(s) \

	pr_alert("%s" PERF_FLAG s "\n", perf_type)

	pr_alert("%s" PERF_FLAG " %s\n", perf_type, s)

#define VERBOSE_PERFOUT_STRING(s) \

	do { if (verbose) pr_alert("%s" PERF_FLAG " %s\n", perf_type, s); } while (0)

#define VERBOSE_PERFOUT_ERRSTRING(s) \
@@ -400,9 +400,8 @@ rcu_perf_writer(void *arg) 
			sp.sched_priority = 0;

			sched_setscheduler_nocheck(current,

						   SCHED_NORMAL, &sp);

			pr_alert("%s" PERF_FLAG

				 "rcu_perf_writer %ld has %d measurements\n",

				 perf_type, me, MIN_MEAS);

			pr_alert("%s%s rcu_perf_writer %ld has %d measurements\n",

				 perf_type, PERF_FLAG, me, MIN_MEAS);

			if (atomic_inc_return(&n_rcu_perf_writer_finished) >=

			    nrealwriters) {

				schedule_timeout_interruptible(10);