[COMMON] arm64: fix conflict file related cpu

Change-Id: I678a907cc4a6e0a6ca3604165ddbcda8b445db60
Signed-off-by: Sangkyu Kim <skwith.kim@samsung.com>
Signed-off-by: Jaehyoung Choi <jkkkkk.choi@samsung.com>

diff --git a/include/linux/cpufreq_times.h b/include/linux/cpufreq_times.h
index 4b7b24b098fc8eb0e6e1f378a858686ccf409434..757bf0cb60704719c49f97467f4813cbe2bed14a 100644 (file)
--- a/include/linux/cpufreq_times.h
+++ b/include/linux/cpufreq_times.h
@@ -21,22 +21,13 @@
 
 #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
@@ -50,6 +41,5 @@ 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 */

diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c
index 51eef8200df8b23a960926a7360034487fab8456..468ec4fc7a3b32d46f423ffb1dd1fa3f32f9ba86 100644 (file)
--- a/kernel/sched/cpufreq_schedutil.c
+++ b/kernel/sched/cpufreq_schedutil.c
@@ -327,62 +327,6 @@ static void sugov_iowait_boost(struct sugov_cpu *sg_cpu, unsigned long *util,
        }
 }
 
-<<<<<<< HEAD
-=======
-#ifdef CONFIG_NO_HZ_COMMON
-static bool sugov_cpu_is_busy(struct sugov_cpu *sg_cpu)
-{
-       unsigned long idle_calls = tick_nohz_get_idle_calls_cpu(sg_cpu->cpu);
-       bool ret = idle_calls == sg_cpu->saved_idle_calls;
-
-       sg_cpu->saved_idle_calls = idle_calls;
-       return ret;
-}
-#else
-static inline bool sugov_cpu_is_busy(struct sugov_cpu *sg_cpu) { return false; }
-#endif /* CONFIG_NO_HZ_COMMON */
-
-static void sugov_update_single(struct update_util_data *hook, u64 time,
-                               unsigned int flags)
-{
-       struct sugov_cpu *sg_cpu = container_of(hook, struct sugov_cpu, update_util);
-       struct sugov_policy *sg_policy = sg_cpu->sg_policy;
-       struct cpufreq_policy *policy = sg_policy->policy;
-       unsigned long util, max;
-       unsigned int next_f;
-       bool busy;
-
-       sugov_set_iowait_boost(sg_cpu, time, flags);
-       sg_cpu->last_update = time;
-
-       if (!sugov_should_update_freq(sg_policy, time))
-               return;
-
-       busy = sugov_cpu_is_busy(sg_cpu);
-
-       if (flags & SCHED_CPUFREQ_DL) {
-               next_f = policy->cpuinfo.max_freq;
-       } else {
-               sugov_get_util(&util, &max, sg_cpu->cpu);
-               sugov_iowait_boost(sg_cpu, &util, &max);
-               next_f = get_next_freq(sg_policy, util, max);
-               /*
-                * Do not reduce the frequency if the CPU has not been idle
-                * recently, as the reduction is likely to be premature then.
-                */
-               if (busy && next_f < sg_policy->next_freq &&
-                   sg_policy->next_freq != UINT_MAX) {
-                       next_f = sg_policy->next_freq;
-
-                       /* Reset cached freq as next_freq has changed */
-                       sg_policy->cached_raw_freq = 0;
-               }
-       }
-
-       sugov_update_commit(sg_policy, time, next_f);
-}
-
->>>>>>> 818299f6bdae
 static unsigned int sugov_next_freq_shared(struct sugov_cpu *sg_cpu, u64 time)
 {
        struct sugov_policy *sg_policy = sg_cpu->sg_policy;

diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c
index bd22e9a08f7f254f1b874711517268da956effe3..d2d874fc28e96b8f23ba284cdfd2170147f82e14 100644 (file)
--- a/kernel/sched/cputime.c
+++ b/kernel/sched/cputime.c
@@ -149,15 +149,8 @@ void account_user_time(struct task_struct *p, u64 cputime)
        /* Account for user time used */
        acct_account_cputime(p);
 
-<<<<<<< HEAD
-#ifdef CONFIG_CPU_FREQ_TIMES
        /* Account power usage for user time */
        cpufreq_acct_update_power(p, cputime);
-#endif
-=======
-       /* Account power usage for user time */
-       cpufreq_acct_update_power(p, cputime);
->>>>>>> 818299f6bdae
 }
 
 /*
@@ -202,16 +195,9 @@ void account_system_index_time(struct task_struct *p,
 
        /* Account for system time used */
        acct_account_cputime(p);
-<<<<<<< HEAD
-#ifdef CONFIG_CPU_FREQ_TIMES
-       /* Account power usage for system time */
-       cpufreq_acct_update_power(p, cputime);
-#endif
-=======
 
        /* Account power usage for system time */
        cpufreq_acct_update_power(p, cputime);
->>>>>>> 818299f6bdae
 }
 
 /*