ANDROID: Reduce use of #ifdef CONFIG_CPU_FREQ_TIMES

Add empty versions of functions to cpufreq_times.h to cut down on use
of #ifdef in .c files.

Test: kernel builds with and without CONFIG_CPU_FREQ_TIMES=y
Change-Id: I49ac364fac3d42bba0ca1801e23b15081094fb12
Signed-off-by: Connor O'Brien <connoro@google.com>

diff --git a/include/linux/cpufreq_times.h b/include/linux/cpufreq_times.h
index e84b576a20d562f407e221d1c47a60a916467434..54419522a53c3e5b24aa625df75c646dddb6ddb8 100644 (file)
--- a/include/linux/cpufreq_times.h
+++ b/include/linux/cpufreq_times.h
@@ -30,6 +30,10 @@ void cpufreq_times_record_transition(struct cpufreq_freqs *freq);
 void cpufreq_task_times_remove_uids(uid_t uid_start, uid_t uid_end);
 int single_uid_time_in_state_open(struct inode *inode, struct file *file);
 #else
+static inline void cpufreq_task_times_init(struct task_struct *p) {}
+static inline void cpufreq_task_times_exit(struct task_struct *p) {}
+static inline void cpufreq_acct_update_power(struct task_struct *p,
+                                            u64 cputime) {}
 static inline void cpufreq_times_create_policy(struct cpufreq_policy *policy) {}
 static inline void cpufreq_times_record_transition(
        struct cpufreq_freqs *freq) {}

diff --git a/kernel/exit.c b/kernel/exit.c
index 1a58e9947f4514ef3ed926f71b9623e3e6fe462d..48e2842ee217bc53de55de463f9d843b1e732fe0 100644 (file)
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -186,9 +186,8 @@ void release_task(struct task_struct *p)
 {
        struct task_struct *leader;
        int zap_leader;
-#ifdef CONFIG_CPU_FREQ_TIMES
+
        cpufreq_task_times_exit(p);
-#endif
 repeat:
        /* don't need to get the RCU readlock here - the process is dead and
         * can't be modifying its own credentials. But shut RCU-lockdep up */

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index be2d50760c88f30e5c9fb01586284e57548c50b7..911ae689b26c543fe6bb7e0b8305857811c64390 100644 (file)
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2240,9 +2240,7 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p)
        memset(&p->se.statistics, 0, sizeof(p->se.statistics));
 #endif
 
-#ifdef CONFIG_CPU_FREQ_TIMES
        cpufreq_task_times_init(p);
-#endif
 
        RB_CLEAR_NODE(&p->dl.rb_node);
        init_dl_task_timer(&p->dl);

diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c
index e7954007b54eef0382699887ce8d113c753f2eb6..d2d874fc28e96b8f23ba284cdfd2170147f82e14 100644 (file)
--- a/kernel/sched/cputime.c
+++ b/kernel/sched/cputime.c
@@ -149,10 +149,8 @@ void account_user_time(struct task_struct *p, u64 cputime)
        /* Account for user time used */
        acct_account_cputime(p);
 
-#ifdef CONFIG_CPU_FREQ_TIMES
        /* Account power usage for user time */
        cpufreq_acct_update_power(p, cputime);
-#endif
 }
 
 /*
@@ -197,10 +195,9 @@ void account_system_index_time(struct task_struct *p,
 
        /* Account for system time used */
        acct_account_cputime(p);
-#ifdef CONFIG_CPU_FREQ_TIMES
+
        /* Account power usage for system time */
        cpufreq_acct_update_power(p, cputime);
-#endif
 }
 
 /*