Re: [tip:sched/core] sched: Add #ifdef around irq time accounting functions

From: Venkatesh Pallipadi
Date: Fri Feb 25 2011 - 13:13:28 EST


On Fri, Feb 25, 2011 at 6:43 AM, tip-bot for Heiko Carstens
<heiko.carstens@xxxxxxxxxx> wrote:
> Commit-ID:  7e9498705e810404ecf29bb2d6fa632b9484c609
> Gitweb:     http://git.kernel.org/tip/7e9498705e810404ecf29bb2d6fa632b9484c609
> Author:     Heiko Carstens <heiko.carstens@xxxxxxxxxx>
> AuthorDate: Fri, 25 Feb 2011 14:32:28 +0100
> Committer:  Ingo Molnar <mingo@xxxxxxx>
> CommitDate: Fri, 25 Feb 2011 14:39:48 +0100
>
> sched: Add #ifdef around irq time accounting functions

I had a slightly different and I think a bit cleaner patch to address
the same problem earlier here
https://lkml.org/lkml/2011/1/31/363

Can you please take that patch instead of this one.

Thanks,
Venki

>
> Get rid of this:
>
>  kernel/sched.c:3731:13: warning: 'irqtime_account_idle_ticks' defined but not used
>  kernel/sched.c:3732:13: warning: 'irqtime_account_process_tick' defined but not used
>
> Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
> Cc: Venkatesh Pallipadi <venki@xxxxxxxxxx>
> Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
> LKML-Reference: <20110225133228.GD7469@xxxxxxxxxxxxxxxxxxxxxxxxxxxx>
> Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
> ---
>  kernel/sched.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/kernel/sched.c b/kernel/sched.c
> index 2effcb7..79bca16 100644
> --- a/kernel/sched.c
> +++ b/kernel/sched.c
> @@ -3687,6 +3687,7 @@ void account_system_time(struct task_struct *p, int hardirq_offset,
>        __account_system_time(p, cputime, cputime_scaled, target_cputime64);
>  }
>
> +#ifndef CONFIG_VIRT_CPU_ACCOUNTING
>  #ifdef CONFIG_IRQ_TIME_ACCOUNTING
>  /*
>  * Account a tick to a process and cpustat
> @@ -3753,6 +3754,7 @@ static void irqtime_account_idle_ticks(int ticks) {}
>  static void irqtime_account_process_tick(struct task_struct *p, int user_tick,
>                                                struct rq *rq) {}
>  #endif
> +#endif /* !CONFIG_VIRT_CPU_ACCOUNTING */
>
>  /*
>  * Account for involuntary wait time.
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/