| From 3495180164c23344c95999ebca971b79265e17fa Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Sat, 25 Jul 2009 16:21:48 +0200 |
| Subject: [PATCH] percpu_counter: Convert to raw_spinlock |
| |
| commit 609368d881acb7c5bcf5560cb4098a202f2e0ba6 in tip. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| |
| diff --git a/include/linux/percpu_counter.h b/include/linux/percpu_counter.h |
| index a7684a5..7823c33 100644 |
| --- a/include/linux/percpu_counter.h |
| +++ b/include/linux/percpu_counter.h |
| @@ -16,7 +16,7 @@ |
| #ifdef CONFIG_SMP |
| |
| struct percpu_counter { |
| - spinlock_t lock; |
| + raw_spinlock_t lock; |
| s64 count; |
| #ifdef CONFIG_HOTPLUG_CPU |
| struct list_head list; /* All percpu_counters are on a list */ |
| diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c |
| index aeaa6d7..10fb740 100644 |
| --- a/lib/percpu_counter.c |
| +++ b/lib/percpu_counter.c |
| @@ -16,13 +16,13 @@ void percpu_counter_set(struct percpu_counter *fbc, s64 amount) |
| { |
| int cpu; |
| |
| - spin_lock(&fbc->lock); |
| + raw_spin_lock(&fbc->lock); |
| for_each_possible_cpu(cpu) { |
| s32 *pcount = per_cpu_ptr(fbc->counters, cpu); |
| *pcount = 0; |
| } |
| fbc->count = amount; |
| - spin_unlock(&fbc->lock); |
| + raw_spin_unlock(&fbc->lock); |
| } |
| EXPORT_SYMBOL(percpu_counter_set); |
| |
| @@ -35,10 +35,10 @@ void __percpu_counter_add(struct percpu_counter *fbc, s64 amount, s32 batch) |
| pcount = per_cpu_ptr(fbc->counters, cpu); |
| count = *pcount + amount; |
| if (count >= batch || count <= -batch) { |
| - spin_lock(&fbc->lock); |
| + raw_spin_lock(&fbc->lock); |
| fbc->count += count; |
| *pcount = 0; |
| - spin_unlock(&fbc->lock); |
| + raw_spin_unlock(&fbc->lock); |
| } else { |
| *pcount = count; |
| } |
| @@ -55,13 +55,13 @@ s64 __percpu_counter_sum(struct percpu_counter *fbc) |
| s64 ret; |
| int cpu; |
| |
| - spin_lock(&fbc->lock); |
| + raw_spin_lock(&fbc->lock); |
| ret = fbc->count; |
| for_each_online_cpu(cpu) { |
| s32 *pcount = per_cpu_ptr(fbc->counters, cpu); |
| ret += *pcount; |
| } |
| - spin_unlock(&fbc->lock); |
| + raw_spin_unlock(&fbc->lock); |
| return ret; |
| } |
| EXPORT_SYMBOL(__percpu_counter_sum); |
| @@ -69,7 +69,7 @@ EXPORT_SYMBOL(__percpu_counter_sum); |
| int __percpu_counter_init(struct percpu_counter *fbc, s64 amount, |
| struct lock_class_key *key) |
| { |
| - spin_lock_init(&fbc->lock); |
| + raw_spin_lock_init(&fbc->lock); |
| lockdep_set_class(&fbc->lock, key); |
| fbc->count = amount; |
| fbc->counters = alloc_percpu(s32); |
| @@ -126,11 +126,11 @@ static int __cpuinit percpu_counter_hotcpu_callback(struct notifier_block *nb, |
| s32 *pcount; |
| unsigned long flags; |
| |
| - spin_lock_irqsave(&fbc->lock, flags); |
| + raw_spin_lock_irqsave(&fbc->lock, flags); |
| pcount = per_cpu_ptr(fbc->counters, cpu); |
| fbc->count += *pcount; |
| *pcount = 0; |
| - spin_unlock_irqrestore(&fbc->lock, flags); |
| + raw_spin_unlock_irqrestore(&fbc->lock, flags); |
| } |
| mutex_unlock(&percpu_counters_lock); |
| #endif |
| -- |
| 1.7.1.1 |
| |