Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc

[powerpc.git] / lib / percpu_counter.c

diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c
index 7a87003..8504490 100644 (file)
--- a/lib/percpu_counter.c
+++ b/lib/percpu_counter.c
@@ -5,10 +5,10 @@
 #include <linux/percpu_counter.h>
 #include <linux/module.h>
 
-void percpu_counter_mod(struct percpu_counter *fbc, long amount)
+void percpu_counter_mod(struct percpu_counter *fbc, s32 amount)
 {
        long count;
-       long *pcount;
+       s32 *pcount;
        int cpu = get_cpu();
 
        pcount = per_cpu_ptr(fbc->counters, cpu);
@@ -29,15 +29,15 @@ EXPORT_SYMBOL(percpu_counter_mod);
  * Add up all the per-cpu counts, return the result.  This is a more accurate
  * but much slower version of percpu_counter_read_positive()
  */
-long percpu_counter_sum(struct percpu_counter *fbc)
+s64 percpu_counter_sum(struct percpu_counter *fbc)
 {
-       long ret;
+       s64 ret;
        int cpu;
 
        spin_lock(&fbc->lock);
        ret = fbc->count;
        for_each_possible_cpu(cpu) {
-               long *pcount = per_cpu_ptr(fbc->counters, cpu);
+               s32 *pcount = per_cpu_ptr(fbc->counters, cpu);
                ret += *pcount;
        }
        spin_unlock(&fbc->lock);