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/arc | |
| 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/arc')
| -rw-r--r-- | arch/arc/include/asm/entry.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arc/include/asm/entry.h b/arch/arc/include/asm/entry.h index 8943c028d4bb..df57611652e5 100644 --- a/arch/arc/include/asm/entry.h +++ b/arch/arc/include/asm/entry.h | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | #include <asm/ptrace.h> | 38 | #include <asm/ptrace.h> |
| 39 | #include <asm/processor.h> /* For VMALLOC_START */ | 39 | #include <asm/processor.h> /* For VMALLOC_START */ |
| 40 | #include <asm/thread_info.h> /* For THREAD_SIZE */ | 40 | #include <asm/thread_info.h> /* For THREAD_SIZE */ |
| 41 | #include <asm/mmu.h> | ||
| 41 | 42 | ||
| 42 | /* Note on the LD/ST addr modes with addr reg wback | 43 | /* Note on the LD/ST addr modes with addr reg wback |
| 43 | * | 44 | * |