From 7828344560ac4db1f488628aec5ffdad74bb9bc3 Mon Sep 17 00:00:00 2001
From: Lorenzo Colitti <lorenzo@google.com>
Date: Wed, 12 Aug 2015 13:59:31 +0900
Subject: [PATCH] Don't call acct_update_power on ARCH=um.

kernel/sched/core.c calls acct_update_power, but that function is
only compiled if CONFIG_CPU_FREQ_STAT is enabled. This breaks the
ability to run kernel unit tests because the kernel won't link
on ARCH=um. #ifdef out the code on ARCH=um.

BUG=21498425
BUG=23016816
Change-Id: I7a95c842ac7eb9017d5e2ff554c9ab8a011a3e4d
Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
---
 kernel/sched/cputime.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c
index 5a40c2d7b9e5..0e5bd97dd585 100644
--- a/kernel/sched/cputime.c
+++ b/kernel/sched/cputime.c
@@ -152,7 +152,9 @@ void account_user_time(struct task_struct *p, cputime_t cputime,
 	acct_account_cputime(p);
 
 	/* Account power usage for user time */
+#ifndef CONFIG_UML
 	acct_update_power(p, cputime);
+#endif
 }
 
 /*
@@ -205,7 +207,9 @@ void __account_system_time(struct task_struct *p, cputime_t cputime,
 	acct_account_cputime(p);
 
 	/* Account power usage for system time */
+#ifndef CONFIG_UML
 	acct_update_power(p, cputime);
+#endif
 }
 
 /*
-- 
GitLab