Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7ae9729 authored by Connor O'Brien's avatar Connor O'Brien
Browse files

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: default avatarConnor O'Brien <connoro@google.com>
parent 2e9aed16

include/linux/cpufreq_times.h

+4 −0
Original line number Diff line number Diff line
@@ -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) {}

kernel/exit.c

+1 −2
Original line number Diff line number Diff line
@@ -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 */

kernel/sched/core.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

kernel/sched/cputime.c

+1 −4
Original line number Diff line number Diff line
@@ -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

}



/*