Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[pandora-kernel.git] / include / asm-generic / bitops / ext2-atomic.h

diff --git a/include/asm-generic/bitops/ext2-atomic.h b/include/asm-generic/bitops/ext2-atomic.h
index ab1c875..ecf1c9d 100644 (file)
--- 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;                                    \
        })