Commit 20e89767 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Linus Torvalds
Browse files

lib: make percpu_counter_add take s64 



percpu_counter is a s64 counter, make _add consitent.

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 252e0ba6

include/linux/percpu_counter.h

+3 −3
Original line number Diff line number Diff line
@@ -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;

lib/percpu_counter.c

+2 −2
Original line number Diff line number Diff line
@@ -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();