From 112e7fcad3b5379b50a78dd345cf484f827b028e Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Tue, 2 Feb 2010 14:46:10 -0800
Subject: [PATCH] --- yaml --- r: 182518 b: refs/heads/master c:
 0c9cf2efd74dbc90354e2ccc7dbd6bad68ec6c4d h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/include/linux/percpu_counter.h | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 435cc977fb17..f21b6089709e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d3e0907b8b239d16720d144e2675ecf10d3bc3b
+refs/heads/master: 0c9cf2efd74dbc90354e2ccc7dbd6bad68ec6c4d
diff --git a/trunk/include/linux/percpu_counter.h b/trunk/include/linux/percpu_counter.h
index a7684a513994..794662b2be5d 100644
--- a/trunk/include/linux/percpu_counter.h
+++ b/trunk/include/linux/percpu_counter.h
@@ -98,9 +98,6 @@ static inline void percpu_counter_set(struct percpu_counter *fbc, s64 amount)
 	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 *fbc, s64 amount)
 	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;