diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-21 00:28:54 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-21 00:28:54 +0200 |
| commit | 8786583db54197b3859311870912f51cb3fca434 (patch) | |
| tree | 1df54a33b084d2a04115efd28064250ae17c6843 | |
| parent | Raise the minimum required gcc version to 4.6 (diff) | |
| parent | EDAC: Add missing MEM_LRDDR4 entry in edac_mem_types[] (diff) | |
| download | linux-8786583db54197b3859311870912f51cb3fca434.tar.xz linux-8786583db54197b3859311870912f51cb3fca434.zip | |
Merge tag 'edac_fixes_for_4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
Pull EDAC fix from Borislav Petkov:
"An urgent fix for a NULL ptr deref on machines with LRDDR4 DIMMs, from
Takashi Iwai"
* tag 'edac_fixes_for_4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
EDAC: Add missing MEM_LRDDR4 entry in edac_mem_types[]
| -rw-r--r-- | drivers/edac/edac_mc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index 3bb82e511eca..7d3edd713932 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c @@ -215,6 +215,7 @@ const char * const edac_mem_types[] = { [MEM_LRDDR3] = "Load-Reduced-DDR3-RAM", [MEM_DDR4] = "Unbuffered-DDR4", [MEM_RDDR4] = "Registered-DDR4", + [MEM_LRDDR4] = "Load-Reduced-DDR4-RAM", [MEM_NVDIMM] = "Non-volatile-RAM", }; EXPORT_SYMBOL_GPL(edac_mem_types); |