From ad34af1a70d024d165dd182f468b79481a80803c Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 15 Feb 2013 07:21:08 -0300 Subject: [PATCH] --- yaml --- r: 359975 b: refs/heads/master c: c66b5a79a9348ccd6d1cd81416027d0e12da965d h: refs/heads/master i: 359973: 9470a9cda521a4e4ee79b7661a8721b347ee3a8f 359971: 6130e67ff07ac0b640cc26805cf74b1abe09f7a9 359967: 5ff8a760bd2e5ce3366321274e2ffa25893de3e7 v: v3 --- [refs] | 2 +- trunk/drivers/edac/edac_mc.c | 1 + trunk/include/linux/edac.h | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0e14db3ef1a9..5ff9c41f4f5c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ab19b06acffd2278cd37995927c85a9acfd00db +refs/heads/master: c66b5a79a9348ccd6d1cd81416027d0e12da965d diff --git a/trunk/drivers/edac/edac_mc.c b/trunk/drivers/edac/edac_mc.c index fb219bc5cb2c..78d8c7d6e76a 100644 --- a/trunk/drivers/edac/edac_mc.c +++ b/trunk/drivers/edac/edac_mc.c @@ -900,6 +900,7 @@ const char *edac_layer_name[] = { [EDAC_MC_LAYER_CHANNEL] = "channel", [EDAC_MC_LAYER_SLOT] = "slot", [EDAC_MC_LAYER_CHIP_SELECT] = "csrow", + [EDAC_MC_LAYER_ALL_MEM] = "memory", }; EXPORT_SYMBOL_GPL(edac_layer_name); diff --git a/trunk/include/linux/edac.h b/trunk/include/linux/edac.h index 4784213c819d..1b7744c219b8 100644 --- a/trunk/include/linux/edac.h +++ b/trunk/include/linux/edac.h @@ -375,6 +375,9 @@ enum scrub_type { * @EDAC_MC_LAYER_CHANNEL: memory layer is named "channel" * @EDAC_MC_LAYER_SLOT: memory layer is named "slot" * @EDAC_MC_LAYER_CHIP_SELECT: memory layer is named "chip select" + * @EDAC_MC_LAYER_ALL_MEM: memory layout is unknown. All memory is mapped + * as a single memory area. This is used when + * retrieving errors from a firmware driven driver. * * This enum is used by the drivers to tell edac_mc_sysfs what name should * be used when describing a memory stick location. @@ -384,6 +387,7 @@ enum edac_mc_layer_type { EDAC_MC_LAYER_CHANNEL, EDAC_MC_LAYER_SLOT, EDAC_MC_LAYER_CHIP_SELECT, + EDAC_MC_LAYER_ALL_MEM, }; /**