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

Commit b64b223a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'rcu/urgent' of... 

Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/urgent
parents 5d53cb27 44100306

include/linux/sched.h

+1 −1
Original line number Diff line number Diff line
@@ -2089,7 +2089,7 @@ extern struct task_struct *idle_task(int cpu); 
 * is_idle_task - is the specified task an idle task?

 * @tsk: the task in question.

 */

static inline bool is_idle_task(struct task_struct *p)

static inline bool is_idle_task(const struct task_struct *p)

{

	return p->pid == 0;

}

kernel/rcutorture.c

+4 −4
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ static int nreaders = -1; /* # reader threads, defaults to 2*ncpus */ 
static int nfakewriters = 4;	/* # fake writer threads */

static int stat_interval;	/* Interval between stats, in seconds. */

				/*  Defaults to "only at end of test". */

static int verbose;		/* Print more debug info. */

static int test_no_idle_hz;	/* Test RCU's support for tickless idle CPUs. */

static bool verbose;		/* Print more debug info. */

static bool test_no_idle_hz;	/* Test RCU's support for tickless idle CPUs. */

static int shuffle_interval = 3; /* Interval between shuffles (in sec)*/

static int stutter = 5;		/* Start/stop testing interval (in sec) */

static int irqreader = 1;	/* RCU readers from irq (timers). */
@@ -1399,7 +1399,7 @@ rcu_torture_shutdown(void *arg) 
 * Execute random CPU-hotplug operations at the interval specified

 * by the onoff_interval.

 */

static int

static int __cpuinit

rcu_torture_onoff(void *arg)

{

	int cpu;
@@ -1447,7 +1447,7 @@ rcu_torture_onoff(void *arg) 
	return 0;

}



static int

static int __cpuinit

rcu_torture_onoff_init(void)

{

	if (onoff_interval <= 0)