Merge branch 'x86/mce' into x86/urgent

Merge in these fixlets.

Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
Ingo Molnar 2012-05-30 14:12:06 +02:00
commit 403e1c5b74
3 changed files with 5 additions and 5 deletions

View file

@ -5,8 +5,6 @@
#include <asm/mce.h>
#define BIT_64(n) (U64_C(1) << (n))
#define EC(x) ((x) & 0xffff)
#define XEC(x, mask) (((x) >> 16) & mask)