From: tip-bot for Heiko Carstens <heiko.carstens@de.ibm.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
a.p.zijlstra@chello.nl, heiko.carstens@de.ibm.com,
tglx@linutronix.de, venki@google.com, mingo@elte.hu
Subject: [tip:sched/core] sched: Add #ifdef around irq time accounting functions
Date: Fri, 25 Feb 2011 14:43:38 GMT [thread overview]
Message-ID: <tip-7e9498705e810404ecf29bb2d6fa632b9484c609@git.kernel.org> (raw)
In-Reply-To: <20110225133228.GD7469@osiris.boeblingen.de.ibm.com>
Commit-ID: 7e9498705e810404ecf29bb2d6fa632b9484c609
Gitweb: http://git.kernel.org/tip/7e9498705e810404ecf29bb2d6fa632b9484c609
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
AuthorDate: Fri, 25 Feb 2011 14:32:28 +0100
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Fri, 25 Feb 2011 14:39:48 +0100
sched: Add #ifdef around irq time accounting functions
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@de.ibm.com>
Cc: Venkatesh Pallipadi <venki@google.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <20110225133228.GD7469@osiris.boeblingen.de.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
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.
next parent reply other threads:[~2011-02-25 14:44 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20110225133228.GD7469@osiris.boeblingen.de.ibm.com>
2011-02-25 14:43 ` tip-bot for Heiko Carstens [this message]
2011-02-25 18:13 ` [tip:sched/core] sched: Add #ifdef around irq time accounting functions Venkatesh Pallipadi
2011-02-25 23:13 ` [PATCH] sched: Minor IRQ_TIME_ACCOUNTING code layout change Venkatesh Pallipadi
2011-02-26 7:03 ` [tip:sched/core] sched: Clean up the IRQ_TIME_ACCOUNTING code tip-bot for Venkatesh Pallipadi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-7e9498705e810404ecf29bb2d6fa632b9484c609@git.kernel.org \
--to=heiko.carstens@de.ibm.com \
--cc=a.p.zijlstra@chello.nl \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=venki@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox