Merge commit '818299f6bdae' into android-exynos-4.14-ww-9610-minor_up-dev

[GitHub/moto-9609/android_kernel_motorola_exynos9610.git] / include / linux / cpufreq_times.h

diff --git a/include/linux/cpufreq_times.h b/include/linux/cpufreq_times.h
index 757bf0cb60704719c49f97467f4813cbe2bed14a..4b7b24b098fc8eb0e6e1f378a858686ccf409434 100644 (file)
--- a/include/linux/cpufreq_times.h
+++ b/include/linux/cpufreq_times.h
@@ -21,13 +21,22 @@
 
 #ifdef CONFIG_CPU_FREQ_TIMES
 void cpufreq_task_times_init(struct task_struct *p);
+<<<<<<< HEAD
+=======
 void cpufreq_task_times_alloc(struct task_struct *p);
+>>>>>>> 818299f6bdae
 void cpufreq_task_times_exit(struct task_struct *p);
 int proc_time_in_state_show(struct seq_file *m, struct pid_namespace *ns,
                            struct pid *pid, struct task_struct *p);
 void cpufreq_acct_update_power(struct task_struct *p, u64 cputime);
 void cpufreq_times_create_policy(struct cpufreq_policy *policy);
 void cpufreq_times_record_transition(struct cpufreq_freqs *freq);
+<<<<<<< HEAD
+#else
+static inline void cpufreq_times_create_policy(struct cpufreq_policy *policy) {}
+static inline 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
@@ -41,5 +50,6 @@ static inline void cpufreq_times_record_transition(
        struct cpufreq_freqs *freq) {}
 static inline void cpufreq_task_times_remove_uids(uid_t uid_start,
                                                  uid_t uid_end) {}
+>>>>>>> 818299f6bdae
 #endif /* CONFIG_CPU_FREQ_TIMES */
 #endif /* _LINUX_CPUFREQ_TIMES_H */