lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ingo Molnar
2012-01-17 09:44:17 +01:00
parent 5d53cb27d8 4410030646
commit b64b223aed
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/sched.h
View File

@@ -2089,7 +2089,7 @@ extern struct task_struct *idle_task(int cpu);
* is_idle_task - is the specified task an idle task? * is_idle_task - is the specified task an idle task?
* @tsk: the task in question. * @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; return p->pid == 0;
} }

8
kernel/rcutorture.c
View File

@@ -56,8 +56,8 @@ static int nreaders = -1; /* # reader threads, defaults to 2*ncpus */
static int nfakewriters = 4; /* # fake writer threads */ static int nfakewriters = 4; /* # fake writer threads */
static int stat_interval; /* Interval between stats, in seconds. */ static int stat_interval; /* Interval between stats, in seconds. */
/* Defaults to "only at end of test". */ /* Defaults to "only at end of test". */
static int verbose; /* Print more debug info. */ static bool verbose; /* Print more debug info. */
static int test_no_idle_hz; /* Test RCU's support for tickless idle CPUs. */ 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 shuffle_interval = 3; /* Interval between shuffles (in sec)*/
static int stutter = 5; /* Start/stop testing interval (in sec) */ static int stutter = 5; /* Start/stop testing interval (in sec) */
static int irqreader = 1; /* RCU readers from irq (timers). */ 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 * Execute random CPU-hotplug operations at the interval specified
* by the onoff_interval. * by the onoff_interval.
*/ */
static int static int __cpuinit
rcu_torture_onoff(void *arg) rcu_torture_onoff(void *arg)
{ {
int cpu; int cpu;
@@ -1447,7 +1447,7 @@ rcu_torture_onoff(void *arg)
return 0; return 0;
} }
static int static int __cpuinit
rcu_torture_onoff_init(void) rcu_torture_onoff_init(void)
{ {
if (onoff_interval <= 0) if (onoff_interval <= 0)