[ARM] Orion: update defconfig to 2.6.26-rc4

[linux-2.6-omap-h63xx.git] / lib / percpu_counter.c

diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c
index 9659eabffc319c5235669a87687949d270536b4e..119174494cb5c096eaf5b1da239dbd5a4040ebc0 100644 (file)
--- a/lib/percpu_counter.c
+++ b/lib/percpu_counter.c
@@ -102,6 +102,7 @@ void percpu_counter_destroy(struct percpu_counter *fbc)
                return;
 
        free_percpu(fbc->counters);
+       fbc->counters = NULL;
 #ifdef CONFIG_HOTPLUG_CPU
        mutex_lock(&percpu_counters_lock);
        list_del(&fbc->list);
@@ -124,12 +125,13 @@ static int __cpuinit percpu_counter_hotcpu_callback(struct notifier_block *nb,
        mutex_lock(&percpu_counters_lock);
        list_for_each_entry(fbc, &percpu_counters, list) {
                s32 *pcount;
+               unsigned long flags;
 
-               spin_lock(&fbc->lock);
+               spin_lock_irqsave(&fbc->lock, flags);
                pcount = per_cpu_ptr(fbc->counters, cpu);
                fbc->count += *pcount;
                *pcount = 0;
-               spin_unlock(&fbc->lock);
+               spin_unlock_irqrestore(&fbc->lock, flags);
        }
        mutex_unlock(&percpu_counters_lock);
        return NOTIFY_OK;