From: Peter Zijlstra Date: Wed, 17 Oct 2007 06:25:43 +0000 (-0700) Subject: lib: make percpu_counter_add take s64 X-Git-Tag: v2.6.24-rc1~811 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=20e89767096392a2cb2404437d3d181b8827af38;p=linux.git lib: make percpu_counter_add take s64 percpu_counter is a s64 counter, make _add consitent. Signed-off-by: Peter Zijlstra Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/include/linux/percpu_counter.h b/include/linux/percpu_counter.h index 40df86f7a3b4..e8fa2da13ba6 100644 --- a/include/linux/percpu_counter.h +++ b/include/linux/percpu_counter.h @@ -32,10 +32,10 @@ struct percpu_counter { void percpu_counter_init(struct percpu_counter *fbc, s64 amount); void percpu_counter_destroy(struct percpu_counter *fbc); -void __percpu_counter_add(struct percpu_counter *fbc, s32 amount, s32 batch); +void __percpu_counter_add(struct percpu_counter *fbc, s64 amount, s32 batch); s64 percpu_counter_sum(struct percpu_counter *fbc); -static inline void percpu_counter_add(struct percpu_counter *fbc, s32 amount) +static inline void percpu_counter_add(struct percpu_counter *fbc, s64 amount) { __percpu_counter_add(fbc, amount, FBC_BATCH); } @@ -79,7 +79,7 @@ static inline void percpu_counter_destroy(struct percpu_counter *fbc) percpu_counter_add(fbc, amount) static inline void -percpu_counter_add(struct percpu_counter *fbc, s32 amount) +percpu_counter_add(struct percpu_counter *fbc, s64 amount) { preempt_disable(); fbc->count += amount; diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c index f736d67c64d7..f7ac68c4c375 100644 --- a/lib/percpu_counter.c +++ b/lib/percpu_counter.c @@ -14,9 +14,9 @@ static LIST_HEAD(percpu_counters); static DEFINE_MUTEX(percpu_counters_lock); #endif -void __percpu_counter_add(struct percpu_counter *fbc, s32 amount, s32 batch) +void __percpu_counter_add(struct percpu_counter *fbc, s64 amount, s32 batch) { - long count; + s64 count; s32 *pcount; int cpu = get_cpu();