diff options
author | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:05 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:18 -0400 |
commit | e060c38434b2caa78efe7cedaff4191040b65a15 (patch) | |
tree | 407361230bf6733f63d8e788e4b5e6566ee04818 /include/asm-generic/bitops/ext2-atomic-setbit.h | |
parent | 10e4ac572eeffe5317019bd7330b6058a400dfc2 (diff) | |
parent | cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941 (diff) |
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
Diffstat (limited to 'include/asm-generic/bitops/ext2-atomic-setbit.h')
-rw-r--r-- | include/asm-generic/bitops/ext2-atomic-setbit.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/asm-generic/bitops/ext2-atomic-setbit.h b/include/asm-generic/bitops/ext2-atomic-setbit.h new file mode 100644 index 000000000000..5a0997857b34 --- /dev/null +++ b/include/asm-generic/bitops/ext2-atomic-setbit.h | |||
@@ -0,0 +1,11 @@ | |||
1 | #ifndef _ASM_GENERIC_BITOPS_EXT2_ATOMIC_SETBIT_H_ | ||
2 | #define _ASM_GENERIC_BITOPS_EXT2_ATOMIC_SETBIT_H_ | ||
3 | |||
4 | /* | ||
5 | * Atomic bitops based version of ext2 atomic bitops | ||
6 | */ | ||
7 | |||
8 | #define ext2_set_bit_atomic(l, nr, addr) test_and_set_bit_le(nr, addr) | ||
9 | #define ext2_clear_bit_atomic(l, nr, addr) test_and_clear_bit_le(nr, addr) | ||
10 | |||
11 | #endif /* _ASM_GENERIC_BITOPS_EXT2_ATOMIC_SETBIT_H_ */ | ||