mmc: SDHCI_INT_DATA_MASK typo error

[safe/jmp/linux-2.6] / lib / percpu_counter.c

diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c
index a60bd80..aeaa6d7 100644 (file)
--- a/lib/percpu_counter.c
+++ b/lib/percpu_counter.c
@@ -66,11 +66,11 @@ s64 __percpu_counter_sum(struct percpu_counter *fbc)
 }
 EXPORT_SYMBOL(__percpu_counter_sum);
 
-static struct lock_class_key percpu_counter_irqsafe;
-
-int percpu_counter_init(struct percpu_counter *fbc, s64 amount)
+int __percpu_counter_init(struct percpu_counter *fbc, s64 amount,
+                         struct lock_class_key *key)
 {
        spin_lock_init(&fbc->lock);
+       lockdep_set_class(&fbc->lock, key);
        fbc->count = amount;
        fbc->counters = alloc_percpu(s32);
        if (!fbc->counters)
@@ -82,17 +82,7 @@ int percpu_counter_init(struct percpu_counter *fbc, s64 amount)
 #endif
        return 0;
 }
-EXPORT_SYMBOL(percpu_counter_init);
-
-int percpu_counter_init_irq(struct percpu_counter *fbc, s64 amount)
-{
-       int err;
-
-       err = percpu_counter_init(fbc, amount);
-       if (!err)
-               lockdep_set_class(&fbc->lock, &percpu_counter_irqsafe);
-       return err;
-}
+EXPORT_SYMBOL(__percpu_counter_init);
 
 void percpu_counter_destroy(struct percpu_counter *fbc)
 {