On Thu, Nov 30, 2017 at 12:40:41PM -0800, Tony Luck wrote:
> There are now non-volatile versions of DIMMs. Add a new entry to
> "enum mem_type" and update places that use it with new strings.
>
> Signed-off-by: Tony Luck <tony.luck@xxxxxxxxx>
> ---
> drivers/edac/edac_mc.c | 1 +
> drivers/edac/edac_mc_sysfs.c | 3 ++-
> include/linux/edac.h | 3 +++
> 3 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
> index 480072139b7a..8178e74decbf 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 RAM",
> [MEM_RDDR4] = "Registered DDR4 RAM",
> + [MEM_NVDIMM] = "Non-volatile RAM",
> };
> EXPORT_SYMBOL_GPL(edac_mem_types);
>
> diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
> index e4fcfa84fbd3..53cbb3518efc 100644
> --- a/drivers/edac/edac_mc_sysfs.c
> +++ b/drivers/edac/edac_mc_sysfs.c
> @@ -110,7 +110,8 @@ static const char * const mem_types[] = {
> [MEM_DDR3] = "Unbuffered-DDR3",
> [MEM_RDDR3] = "Registered-DDR3",
> [MEM_DDR4] = "Unbuffered-DDR4",
> - [MEM_RDDR4] = "Registered-DDR4"
> + [MEM_RDDR4] = "Registered-DDR4",
> + [MEM_NVDIMM] = "Non-volatile RAM",
> };
WTF, there are *two* string arrays with memory types?! How did that
happen?
Can you please remove that above in a prepatch and switch to
edac_mem_types? Or should we switch to this mem_types array instead and
kill edac_mem_types since former is visible in sysfs?
:-( Grrr.
--
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
