From ab1fad9f9044fffe8b4a52623fdeaddb4bddb829 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Sat, 21 Jan 2012 11:03:13 -0800 Subject: [PATCH] --- yaml --- r: 286619 b: refs/heads/master c: fa757281a08799fd6c0f7ec6f111d1cd66afc97b h: refs/heads/master i: 286617: 95f0e00d9fffaafa921d2bbfd272a15f1374144b 286615: 66ab34987db81a1021da99b6c1b5b1ec046d345c v: v3 --- [refs] | 2 +- trunk/include/linux/sched.h | 2 +- trunk/kernel/sched/cpupri.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 716eb869b894..b6c29500ada9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f6c76aa5f0fb53059730c628ac59ef62a14ed7a +refs/heads/master: fa757281a08799fd6c0f7ec6f111d1cd66afc97b diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index 4032ec1cf836..513f52459872 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/include/linux/sched.h @@ -2088,7 +2088,7 @@ extern int sched_setscheduler_nocheck(struct task_struct *, int, extern struct task_struct *idle_task(int cpu); /** * is_idle_task - is the specified task an idle task? - * @tsk: the task in question. + * @p: the task in question. */ static inline bool is_idle_task(struct task_struct *p) { diff --git a/trunk/kernel/sched/cpupri.c b/trunk/kernel/sched/cpupri.c index b0d798eaf130..d72586fdf660 100644 --- a/trunk/kernel/sched/cpupri.c +++ b/trunk/kernel/sched/cpupri.c @@ -129,7 +129,7 @@ int cpupri_find(struct cpupri *cp, struct task_struct *p, * cpupri_set - update the cpu priority setting * @cp: The cpupri context * @cpu: The target cpu - * @pri: The priority (INVALID-RT99) to assign to this CPU + * @newpri: The priority (INVALID-RT99) to assign to this CPU * * Note: Assumes cpu_rq(cpu)->lock is locked * @@ -200,7 +200,6 @@ void cpupri_set(struct cpupri *cp, int cpu, int newpri) /** * cpupri_init - initialize the cpupri structure * @cp: The cpupri context - * @bootmem: true if allocations need to use bootmem * * Returns: -ENOMEM if memory fails. */