summaryrefslogtreecommitdiff
path: root/include/linux/bitops.h
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2013-11-25 14:47:27 -0800
committerTony Lindgren <tony@atomide.com>2013-11-25 14:47:27 -0800
commit6310f3a9362e8fa2e29c8f84aa603b5f86e98442 (patch)
treeb071c5e43cc2075f9fa7f07bcc0101a56b779c35 /include/linux/bitops.h
parentb2ff4790612bbfa3433cc92e56445c2a40098e2c (diff)
parentedd5eb4e99e4153ea7be05390fda542d986bf28d (diff)
Merge branch 'dt-regressions' into omap-for-v3.13/fixes-take4
Diffstat (limited to 'include/linux/bitops.h')
-rw-r--r--include/linux/bitops.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index bd0c4598d03b..abc9ca778456 100644
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@ -4,8 +4,11 @@
#ifdef __KERNEL__
#define BIT(nr) (1UL << (nr))
+#define BIT_ULL(nr) (1ULL << (nr))
#define BIT_MASK(nr) (1UL << ((nr) % BITS_PER_LONG))
#define BIT_WORD(nr) ((nr) / BITS_PER_LONG)
+#define BIT_ULL_MASK(nr) (1ULL << ((nr) % BITS_PER_LONG_LONG))
+#define BIT_ULL_WORD(nr) ((nr) / BITS_PER_LONG_LONG)
#define BITS_PER_BYTE 8
#define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long))
#endif