summaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-05-30 14:12:06 +0200
committerIngo Molnar <mingo@kernel.org>2012-05-30 14:12:06 +0200
commit403e1c5b7495d7b80fae9fc4d0a7a6f5abdc3307 (patch)
treec1f762dda525faf24aa10d6f81cf043da202c54f /arch/x86/include
parentfa83523f45fbb403eba4ebc5704bf98aa4da0163 (diff)
parent80f033610fb968e75f5d470233d8d0260d7a72ed (diff)
Merge branch 'x86/mce' into x86/urgent
Merge in these fixlets. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/bitops.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
index b97596e2b68..a6983b27722 100644
--- a/arch/x86/include/asm/bitops.h
+++ b/arch/x86/include/asm/bitops.h
@@ -15,6 +15,8 @@
#include <linux/compiler.h>
#include <asm/alternative.h>
+#define BIT_64(n) (U64_C(1) << (n))
+
/*
* These have to be done with inline assembly: that way the bit-setting
* is guaranteed to be atomic. All bit operations return 0 if the bit