diff options
| author |   Peter Zijlstra <a.p.zijlstra@chello.nl> | 2007-10-16 23:25:43 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 08:42:44 -0700 |
| commit | 20e89767096392a2cb2404437d3d181b8827af38 (patch) | |
| tree | a20dd2e0c987d12e9161d5784a58c55f4aa0862f | |
| parent | lib: percpu_counter variable batch (diff) | |
| download | linux-dev-20e89767096392a2cb2404437d3d181b8827af38.tar.xz linux-dev-20e89767096392a2cb2404437d3d181b8827af38.zip | |
lib: make percpu_counter_add take s64
percpu_counter is a s64 counter, make _add consitent.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | include/linux/percpu_counter.h | 6 | ||||
| -rw-r--r-- | lib/percpu_counter.c | 4 |
2 files changed, 5 insertions, 5 deletions
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(); |