diff options
-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 { | |||
32 | 32 | ||
33 | void percpu_counter_init(struct percpu_counter *fbc, s64 amount); | 33 | void percpu_counter_init(struct percpu_counter *fbc, s64 amount); |
34 | void percpu_counter_destroy(struct percpu_counter *fbc); | 34 | void percpu_counter_destroy(struct percpu_counter *fbc); |
35 | void __percpu_counter_add(struct percpu_counter *fbc, s32 amount, s32 batch); | 35 | void __percpu_counter_add(struct percpu_counter *fbc, s64 amount, s32 batch); |
36 | s64 percpu_counter_sum(struct percpu_counter *fbc); | 36 | s64 percpu_counter_sum(struct percpu_counter *fbc); |
37 | 37 | ||
38 | static inline void percpu_counter_add(struct percpu_counter *fbc, s32 amount) | 38 | static inline void percpu_counter_add(struct percpu_counter *fbc, s64 amount) |
39 | { | 39 | { |
40 | __percpu_counter_add(fbc, amount, FBC_BATCH); | 40 | __percpu_counter_add(fbc, amount, FBC_BATCH); |
41 | } | 41 | } |
@@ -79,7 +79,7 @@ static inline void percpu_counter_destroy(struct percpu_counter *fbc) | |||
79 | percpu_counter_add(fbc, amount) | 79 | percpu_counter_add(fbc, amount) |
80 | 80 | ||
81 | static inline void | 81 | static inline void |
82 | percpu_counter_add(struct percpu_counter *fbc, s32 amount) | 82 | percpu_counter_add(struct percpu_counter *fbc, s64 amount) |
83 | { | 83 | { |
84 | preempt_disable(); | 84 | preempt_disable(); |
85 | fbc->count += amount; | 85 | 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); | |||
14 | static DEFINE_MUTEX(percpu_counters_lock); | 14 | static DEFINE_MUTEX(percpu_counters_lock); |
15 | #endif | 15 | #endif |
16 | 16 | ||
17 | void __percpu_counter_add(struct percpu_counter *fbc, s32 amount, s32 batch) | 17 | void __percpu_counter_add(struct percpu_counter *fbc, s64 amount, s32 batch) |
18 | { | 18 | { |
19 | long count; | 19 | s64 count; |
20 | s32 *pcount; | 20 | s32 *pcount; |
21 | int cpu = get_cpu(); | 21 | int cpu = get_cpu(); |
22 | 22 | ||