ANDROID: cpufreq: times: Have two spinlock in different cache line

task_time_in_state_lock and uid_lock currently is
very possiblly in same cache line that will cause
livelock if 2 cores in contention.

Change-Id: I644687c4d610af5e84a43f422a711d386d6d5181
Signed-off-by: Tengfei Fan <tengfeif@codeaurora.org>
(cherry picked from commit bfea4ae591301043498a214cf6ef4e6250106316)

Author: Tengfei Fan

drivers/cpufreq/cpufreq_times.c

@@ -30,12 +30,14 @@
 
 static DECLARE_HASHTABLE(uid_hash_table, UID_HASH_BITS);
 
-static DEFINE_SPINLOCK(task_time_in_state_lock); /* task->time_in_state */
-static DEFINE_SPINLOCK(task_concurrent_active_time_lock);
-	/* task->concurrent_active_time */
-static DEFINE_SPINLOCK(task_concurrent_policy_time_lock);
-	/* task->concurrent_policy_time */
-static DEFINE_SPINLOCK(uid_lock); /* uid_hash_table */
+/* task->time_in_state */
+static  __cacheline_aligned_in_smp DEFINE_SPINLOCK(task_time_in_state_lock);
+/* task->concurrent_active_time */
+static  __cacheline_aligned_in_smp DEFINE_SPINLOCK(task_concurrent_active_time_lock);
+/* task->concurrent_policy_time */
+static  __cacheline_aligned_in_smp DEFINE_SPINLOCK(task_concurrent_policy_time_lock);
+/* uid_hash_table */
+static __cacheline_aligned_in_smp DEFINE_SPINLOCK(uid_lock);
 
 struct concurrent_times {
 	atomic64_t active[NR_CPUS];