diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-12-18 09:18:45 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-12-18 09:18:45 +0100 |
commit | a228b5892b0527b8574c06edc72cacaf8c25418d (patch) | |
tree | 0b70c47c07fad1a18301e63be52e8252d16c0af5 /arch/x86/include/asm/mce.h | |
parent | Merge branch 'early-mce-decode' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
parent | x86: add IRQ context simulation in module mce-inject (diff) | |
download | linux-a228b5892b0527b8574c06edc72cacaf8c25418d.tar.xz linux-a228b5892b0527b8574c06edc72cacaf8c25418d.zip |
Merge branch 'mce-inject' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/mce
Diffstat (limited to 'arch/x86/include/asm/mce.h')
-rw-r--r-- | arch/x86/include/asm/mce.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index b7c47a468fde..6add827381c9 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h @@ -50,10 +50,11 @@ #define MCJ_CTX_MASK 3 #define MCJ_CTX(flags) ((flags) & MCJ_CTX_MASK) #define MCJ_CTX_RANDOM 0 /* inject context: random */ -#define MCJ_CTX_PROCESS 1 /* inject context: process */ -#define MCJ_CTX_IRQ 2 /* inject context: IRQ */ -#define MCJ_NMI_BROADCAST 4 /* do NMI broadcasting */ -#define MCJ_EXCEPTION 8 /* raise as exception */ +#define MCJ_CTX_PROCESS 0x1 /* inject context: process */ +#define MCJ_CTX_IRQ 0x2 /* inject context: IRQ */ +#define MCJ_NMI_BROADCAST 0x4 /* do NMI broadcasting */ +#define MCJ_EXCEPTION 0x8 /* raise as exception */ +#define MCJ_IRQ_BRAODCAST 0x10 /* do IRQ broadcasting */ /* Fields are zero when not available */ struct mce { |