Merge branch 'master' into for-next

Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.

1 files changed, 2 insertions, 2 deletions

diff --git a/include/asm-generic/bitops/ext2-atomic.h b/include/asm-generic/bitops/ext2-atomic.h
index ab1c875efb74..ecf1c9d8a7cc 100644
--- a/include/asm-generic/bitops/ext2-atomic.h
+++ b/include/asm-generic/bitops/ext2-atomic.h
@@ -5,7 +5,7 @@
         ({                                              \
                 int ret;                                \
                 spin_lock(lock);                        \
-                ret = ext2_set_bit((nr), (unsigned long *)(addr)); \
+                ret = __test_and_set_bit_le(nr, addr);  \
                 spin_unlock(lock);                      \
                 ret;                                    \
         })
@@ -14,7 +14,7 @@
         ({                                              \
                 int ret;                                \
                 spin_lock(lock);                        \
-                ret = ext2_clear_bit((nr), (unsigned long *)(addr)); \
+                ret = __test_and_clear_bit_le(nr, addr);        \
                 spin_unlock(lock);                      \
                 ret;                                    \
         })