From a094d1c6598d5339cc545d8c8ed707020f5521fb Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 26 Jul 2011 16:09:10 -0700
Subject: [PATCH] --- yaml --- r: 260451 b: refs/heads/master c:
 f6081bd3f8152cdd3d857f55631bbb4b72182b82 h: refs/heads/master i:   260449:
 1e49d29b9259b2601d0707034e5d2e583314dde6   260447:
 42d212a9439cff0177fc0cfe0b2ba458bfb8d12d v: v3

---
 [refs]                             |  2 +-
 trunk/include/asm-generic/atomic.h | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4f6f458abc01..8e121a776327 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3eea44ea753923c6af90be808426ecddc482de61
+refs/heads/master: f6081bd3f8152cdd3d857f55631bbb4b72182b82
diff --git a/trunk/include/asm-generic/atomic.h b/trunk/include/asm-generic/atomic.h
index 2a23da03365e..4e8ecf0693e9 100644
--- a/trunk/include/asm-generic/atomic.h
+++ b/trunk/include/asm-generic/atomic.h
@@ -140,13 +140,20 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
   return c;
 }
 
-static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
+/**
+ * atomic_clear_mask - Atomically clear bits in atomic variable
+ * @mask: Mask of the bits to be cleared
+ * @v: pointer of type atomic_t
+ *
+ * Atomically clears the bits set in @mask from @v
+ */
+static inline void atomic_clear_mask(unsigned long mask, atomic_t *v)
 {
 	unsigned long flags;
 
 	mask = ~mask;
 	raw_local_irq_save(flags); /* Don't trace it in a irqsoff handler */
-	*addr &= mask;
+	v->counter &= mask;
 	raw_local_irq_restore(flags);
 }