Patched in Tegra support.

1 files changed, 16 insertions, 18 deletions

diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c
index ba6085d9c74..28f2c33c6b5 100644
--- a/lib/percpu_counter.c
+++ b/lib/percpu_counter.c
@@ -10,10 +10,8 @@
 #include <linux/module.h>
 #include <linux/debugobjects.h>
 
-#ifdef CONFIG_HOTPLUG_CPU
 static LIST_HEAD(percpu_counters);
-static DEFINE_SPINLOCK(percpu_counters_lock);
-#endif
+static DEFINE_MUTEX(percpu_counters_lock);
 
 #ifdef CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER
 
@@ -61,13 +59,13 @@ void percpu_counter_set(struct percpu_counter *fbc, s64 amount)
 {
         int cpu;
 
-        raw_spin_lock(&fbc->lock);
+        spin_lock(&fbc->lock);
         for_each_possible_cpu(cpu) {
                 s32 *pcount = per_cpu_ptr(fbc->counters, cpu);
                 *pcount = 0;
         }
         fbc->count = amount;
-        raw_spin_unlock(&fbc->lock);
+        spin_unlock(&fbc->lock);
 }
 EXPORT_SYMBOL(percpu_counter_set);
 
@@ -78,10 +76,10 @@ void __percpu_counter_add(struct percpu_counter *fbc, s64 amount, s32 batch)
         preempt_disable();
         count = __this_cpu_read(*fbc->counters) + amount;
         if (count >= batch || count <= -batch) {
-                raw_spin_lock(&fbc->lock);
+                spin_lock(&fbc->lock);
                 fbc->count += count;
                 __this_cpu_write(*fbc->counters, 0);
-                raw_spin_unlock(&fbc->lock);
+                spin_unlock(&fbc->lock);
         } else {
                 __this_cpu_write(*fbc->counters, count);
         }
@@ -98,13 +96,13 @@ s64 __percpu_counter_sum(struct percpu_counter *fbc)
         s64 ret;
         int cpu;
 
-        raw_spin_lock(&fbc->lock);
+        spin_lock(&fbc->lock);
         ret = fbc->count;
         for_each_online_cpu(cpu) {
                 s32 *pcount = per_cpu_ptr(fbc->counters, cpu);
                 ret += *pcount;
         }
-        raw_spin_unlock(&fbc->lock);
+        spin_unlock(&fbc->lock);
         return ret;
 }
 EXPORT_SYMBOL(__percpu_counter_sum);
@@ -112,7 +110,7 @@ EXPORT_SYMBOL(__percpu_counter_sum);
 int __percpu_counter_init(struct percpu_counter *fbc, s64 amount,
                           struct lock_class_key *key)
 {
-        raw_spin_lock_init(&fbc->lock);
+        spin_lock_init(&fbc->lock);
         lockdep_set_class(&fbc->lock, key);
         fbc->count = amount;
         fbc->counters = alloc_percpu(s32);
@@ -123,9 +121,9 @@ int __percpu_counter_init(struct percpu_counter *fbc, s64 amount,
 
 #ifdef CONFIG_HOTPLUG_CPU
         INIT_LIST_HEAD(&fbc->list);
-        spin_lock(&percpu_counters_lock);
+        mutex_lock(&percpu_counters_lock);
         list_add(&fbc->list, &percpu_counters);
-        spin_unlock(&percpu_counters_lock);
+        mutex_unlock(&percpu_counters_lock);
 #endif
         return 0;
 }
@@ -139,9 +137,9 @@ void percpu_counter_destroy(struct percpu_counter *fbc)
         debug_percpu_counter_deactivate(fbc);
 
 #ifdef CONFIG_HOTPLUG_CPU
-        spin_lock(&percpu_counters_lock);
+        mutex_lock(&percpu_counters_lock);
         list_del(&fbc->list);
-        spin_unlock(&percpu_counters_lock);
+        mutex_unlock(&percpu_counters_lock);
 #endif
         free_percpu(fbc->counters);
         fbc->counters = NULL;
@@ -170,18 +168,18 @@ static int __cpuinit percpu_counter_hotcpu_callback(struct notifier_block *nb,
                 return NOTIFY_OK;
 
         cpu = (unsigned long)hcpu;
-        spin_lock(&percpu_counters_lock);
+        mutex_lock(&percpu_counters_lock);
         list_for_each_entry(fbc, &percpu_counters, list) {
                 s32 *pcount;
                 unsigned long flags;
 
-                raw_spin_lock_irqsave(&fbc->lock, flags);
+                spin_lock_irqsave(&fbc->lock, flags);
                 pcount = per_cpu_ptr(fbc->counters, cpu);
                 fbc->count += *pcount;
                 *pcount = 0;
-                raw_spin_unlock_irqrestore(&fbc->lock, flags);
+                spin_unlock_irqrestore(&fbc->lock, flags);
         }
-        spin_unlock(&percpu_counters_lock);
+        mutex_unlock(&percpu_counters_lock);
 #endif
         return NOTIFY_OK;
 }