From 1b1c8d6849655e6924c453e5ad377157f65eb950 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Thu, 4 Jun 2015 20:04:37 +0530 Subject: [PATCH] sched: cpufreq: update power usage only if cpufreq_stat is enabled Call acct_update_power() to track power usage of task only if CONFIG_CPU_FREQ_STAT is enabled, otherwise we run into following build failure: --------------- kernel/built-in.o: In function `account_user_time': kernel/sched/cputime.c:155: undefined reference to `acct_update_power' kernel/built-in.o: In function `__account_system_time': kernel/sched/cputime.c:208: undefined reference to `acct_update_power' make: *** [vmlinux] Error 1 --------------- Signed-off-by: Amit Pundir --- kernel/sched/cputime.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c index cc211d01f77f..8e8259ee4e1a 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c @@ -151,8 +151,10 @@ void account_user_time(struct task_struct *p, cputime_t cputime, /* Account for user time used */ acct_account_cputime(p); +#ifdef CONFIG_CPU_FREQ_STAT /* Account power usage for user time */ acct_update_power(p, cputime); +#endif } /* @@ -204,8 +206,10 @@ void __account_system_time(struct task_struct *p, cputime_t cputime, /* Account for system time used */ acct_account_cputime(p); +#ifdef CONFIG_CPU_FREQ_STAT /* Account power usage for system time */ acct_update_power(p, cputime); +#endif } /* -- 2.34.1