From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Carstens Subject: [PATCH/resend] sched: add #ifdef around irq time accounting functions Date: Fri, 25 Feb 2011 14:32:28 +0100 Message-ID: <20110225133228.GD7469@osiris.boeblingen.de.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mtagate3.uk.ibm.com ([194.196.100.163]:41981 "EHLO mtagate3.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755669Ab1BYNcd (ORCPT ); Fri, 25 Feb 2011 08:32:33 -0500 Received: from d06nrmr1507.portsmouth.uk.ibm.com (d06nrmr1507.portsmouth.uk.ibm.com [9.149.38.233]) by mtagate3.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p1PDWTWp020176 for ; Fri, 25 Feb 2011 13:32:29 GMT Received: from d06av04.portsmouth.uk.ibm.com (d06av04.portsmouth.uk.ibm.com [9.149.37.216]) by d06nrmr1507.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p1PDWd1D1167584 for ; Fri, 25 Feb 2011 13:32:39 GMT Received: from d06av04.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p1PDWSW4006753 for ; Fri, 25 Feb 2011 06:32:29 -0700 Content-Disposition: inline Sender: linux-next-owner@vger.kernel.org List-ID: To: Venkatesh Pallipadi , Peter Zijlstra Cc: linux-next@vger.kernel.org From: Heiko Carstens 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 Cc: Venkatesh Pallipadi Signed-off-by: Heiko Carstens --- Resending, because I screwed up Peter's email address... Patch is against linux-next. kernel/sched.c | 2 ++ 1 file changed, 2 insertions(+) --- a/kernel/sched.c +++ b/kernel/sched.c @@ -3666,6 +3666,7 @@ void account_system_time(struct task_str __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 @@ -3732,6 +3733,7 @@ static void irqtime_account_idle_ticks(i 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.