Re: [PATCH] cpuset: sparse warnings in cpuset.c

Andrew Morton
2008-02-23T08:12:34Z

On Sat, 02 Feb 2008 23:42:23 -0800 Harvey Harrison <harvey.harrison@gmail.com> wrote:

^^^^^^ I suck.

> Don't redeclare p, use a new variable q.
>
> kernel/cpuset.c:824:23: warning: symbol 'p' shadows an earlier one
> kernel/cpuset.c:746:21: originally declared here
> kernel/cpuset.c:1272:52: warning: Using plain integer as NULL pointer
>
> Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
> ---
> Paul, used a variable q instead as per your request.
>
> kernel/cpuset.c | 13 +++++++------
> 1 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/kernel/cpuset.c b/kernel/cpuset.c
> index cfaf641..ce0cfff 100644
> --- a/kernel/cpuset.c
> +++ b/kernel/cpuset.c
> @@ -821,13 +821,13 @@ static int update_cpumask(struct cpuset *cs, char *buf)
> cgroup_iter_end(cgrp, &it);
> if (heap.size) {
> for (i = 0; i < heap.size; i++) {
> - struct task_struct *p = heap.ptrs[i];
> + struct task_struct *q = heap.ptrs[i];
> if (i == 0) {
> - latest_time = p->start_time;
> - latest_task = p;
> + latest_time = q->start_time;
> + latest_task = q;
> }
> - set_cpus_allowed(p, cs->cpus_allowed);
> - put_task_struct(p);
> + set_cpus_allowed(q, cs->cpus_allowed);
> + put_task_struct(q);
> }
> /*
> * If we had to process any tasks at all, scan again

Sorry, the above code doesn't seem to exist any more.