The patch titled percpu_counter: make __percpu_counter_add an inline function on UP has been removed from the -mm tree. Its filename was percpu_counter-make-__percpu_counter_add-an-inline-function-on-up.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: percpu_counter: make __percpu_counter_add an inline function on UP From: Anton Blanchard <anton@xxxxxxxxx> Even though batch isn't used on UP, we may want to pass one in to keep the SMP and UP code paths similar. Convert __percpu_counter_add to an inline function so we wont get variable unused warnings if we do. Signed-off-by: Anton Blanchard <anton@xxxxxxxxx> Cc: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> Cc: "Luck, Tony" <tony.luck@xxxxxxxxx> Cc: Balbir Singh <balbir@xxxxxxxxxxxxxxxxxx> Cc: Balbir Singh <balbir@xxxxxxxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/percpu_counter.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff -puN include/linux/percpu_counter.h~percpu_counter-make-__percpu_counter_add-an-inline-function-on-up include/linux/percpu_counter.h --- a/include/linux/percpu_counter.h~percpu_counter-make-__percpu_counter_add-an-inline-function-on-up +++ a/include/linux/percpu_counter.h @@ -98,9 +98,6 @@ static inline void percpu_counter_set(st fbc->count = amount; } -#define __percpu_counter_add(fbc, amount, batch) \ - percpu_counter_add(fbc, amount) - static inline void percpu_counter_add(struct percpu_counter *fbc, s64 amount) { @@ -109,6 +106,12 @@ percpu_counter_add(struct percpu_counter preempt_enable(); } +static inline void +__percpu_counter_add(struct percpu_counter *fbc, s64 amount, s32 batch) +{ + percpu_counter_add(fbc, amount); +} + static inline s64 percpu_counter_read(struct percpu_counter *fbc) { return fbc->count; _ Patches currently in -mm which might be from anton@xxxxxxxxx are origin.patch linux-next.patch panic-fix-panic_timeout-accuracy-when-running-on-a-hypervisor.patch exec-create-initial-stack-independent-of-page_size.patch zlib-make-new-optimized-inflate-endian-independent.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html