diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-04 20:26:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-04 20:26:07 -0700 |
| commit | 0ef283d4c7808cb264f904de5e29a0b661747fc4 (patch) | |
| tree | 2bab8ce30de851b87af4d4877fc46c8d7df9e6b8 /arch/x86/kernel/cpu/mcheck/mce-inject.c | |
| parent | Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | x86/MCE/AMD: Read MCx_MISC block addresses on any CPU (diff) | |
| download | linux-dev-0ef283d4c7808cb264f904de5e29a0b661747fc4.tar.xz linux-dev-0ef283d4c7808cb264f904de5e29a0b661747fc4.zip | |
Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 RAS updates from Thomas Gleixner:
- Fix a stack out of bounds write in the MCE error injection code.
- Avoid IPIs during CPU hotplug to read the MCx_MISC block address from
a remote CPU. That's fragile and pointless because the block
addresses are the same on all CPUs. So they can be read once and
local.
- Add support for MCE broadcasting on newer VIA Centaur CPUs.
* 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/MCE/AMD: Read MCx_MISC block addresses on any CPU
x86/MCE: Fix stack out-of-bounds write in mce-inject.c: Flags_read()
x86/MCE: Enable MCE broadcasting on new Centaur CPUs
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck/mce-inject.c')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce-inject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce-inject.c b/arch/x86/kernel/cpu/mcheck/mce-inject.c index 475cb4f5f14f..c805a06e14c3 100644 --- a/arch/x86/kernel/cpu/mcheck/mce-inject.c +++ b/arch/x86/kernel/cpu/mcheck/mce-inject.c @@ -48,7 +48,7 @@ static struct dentry *dfs_inj; static u8 n_banks; -#define MAX_FLAG_OPT_SIZE 3 +#define MAX_FLAG_OPT_SIZE 4 #define NBCFG 0x44 enum injection_type { |