diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-08-12 13:51:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-08-12 13:51:43 -0400 |
| commit | 6356bb0ad6525dae93c06478a098ed3848e9ab01 (patch) | |
| tree | 8fdbda28405fb0b1c213f2a87c532a760510adf0 /arch/sh | |
| parent | 7781544e7c367d0cae87feb0f0675fd333bfc9d8 (diff) | |
| parent | 0ca06c0857aee11911f91621db14498496f2c2cd (diff) | |
Merge tag 'please-pull-mce-f-bit' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/ras
Pull MCE-uncorrected-error fix from Tony Luck:
"Bit 12 may or may not be set in MCi_STATUS.MCACOD when
an uncorrected error is reported. Ignore it when checking
error signatures."
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/configs/sh03_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/configs/sh03_defconfig b/arch/sh/configs/sh03_defconfig index 2051821724c6..0cf4097b71e8 100644 --- a/arch/sh/configs/sh03_defconfig +++ b/arch/sh/configs/sh03_defconfig | |||
| @@ -22,7 +22,7 @@ CONFIG_PREEMPT=y | |||
| 22 | CONFIG_CMDLINE_OVERWRITE=y | 22 | CONFIG_CMDLINE_OVERWRITE=y |
| 23 | CONFIG_CMDLINE="console=ttySC1,115200 mem=64M root=/dev/nfs" | 23 | CONFIG_CMDLINE="console=ttySC1,115200 mem=64M root=/dev/nfs" |
| 24 | CONFIG_PCI=y | 24 | CONFIG_PCI=y |
| 25 | CONFIG_HOTPLUG_PCI=m | 25 | CONFIG_HOTPLUG_PCI=y |
| 26 | CONFIG_BINFMT_MISC=y | 26 | CONFIG_BINFMT_MISC=y |
| 27 | CONFIG_NET=y | 27 | CONFIG_NET=y |
| 28 | CONFIG_PACKET=y | 28 | CONFIG_PACKET=y |