diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-06-19 13:51:33 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-06-19 13:51:54 +0200 |
commit | 2e7e98b85d2b4a085296cad42d0247d4dd3d5778 (patch) | |
tree | e4403243d837298405e9f2c96d0987aab371eddc /arch/x86/include | |
parent | Merge tag 'please-pull-fixia64' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
parent | x86, mce: Fix "braodcast" typo (diff) | |
download | linux-2e7e98b85d2b4a085296cad42d0247d4dd3d5778.tar.xz linux-2e7e98b85d2b4a085296cad42d0247d4dd3d5778.zip |
Merge tag 'ras_fixlet_for_3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/ras
Pull "Fix typo in define" change from Borislav Petkov.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include')
-rw-r--r-- | arch/x86/include/asm/mce.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index fa5f71e021d5..6b52980c29c1 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h @@ -61,7 +61,7 @@ #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 */ +#define MCJ_IRQ_BROADCAST 0x10 /* do IRQ broadcasting */ #define MCE_OVERFLOW 0 /* bit 0 in flags means overflow */ |