From 50c464e1ded139dfce5ca75ba85cdd2d487a8e48 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Tue, 12 Jun 2012 10:55:57 -0300
Subject: [PATCH] --- yaml --- r: 319390 b: refs/heads/master c:
 38ced28b21efff18fd5e5c98a92830e8f0031cee h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/edac/edac_mc_sysfs.c | 15 +++++++++++++--
 trunk/include/linux/edac.h         |  1 +
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ccd49bc579b3..7efe266d263f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69154d069869b612383cef9d594f39b34ffba6dd
+refs/heads/master: 38ced28b21efff18fd5e5c98a92830e8f0031cee
diff --git a/trunk/drivers/edac/edac_mc_sysfs.c b/trunk/drivers/edac/edac_mc_sysfs.c
index a2bf7e9dd6de..ed0bc07b8503 100644
--- a/trunk/drivers/edac/edac_mc_sysfs.c
+++ b/trunk/drivers/edac/edac_mc_sysfs.c
@@ -812,18 +812,24 @@ static ssize_t edac_fake_inject_write(struct file *file,
 	struct device *dev = file->private_data;
 	struct mem_ctl_info *mci = to_mci(dev);
 	static enum hw_event_mc_err_type type;
+	u16 errcount = mci->fake_inject_count;
+
+	if (!errcount)
+		errcount = 1;
 
 	type = mci->fake_inject_ue ? HW_EVENT_ERR_UNCORRECTED
 				   : HW_EVENT_ERR_CORRECTED;
 
 	printk(KERN_DEBUG
-	       "Generating a %s fake error to %d.%d.%d to test core handling. NOTE: this won't test the driver-specific decoding logic.\n",
+	       "Generating %d %s fake error%s to %d.%d.%d to test core handling. NOTE: this won't test the driver-specific decoding logic.\n",
+		errcount,
 		(type == HW_EVENT_ERR_UNCORRECTED) ? "UE" : "CE",
+		errcount > 1 ? "s" : "",
 		mci->fake_inject_layer[0],
 		mci->fake_inject_layer[1],
 		mci->fake_inject_layer[2]
 	       );
-	edac_mc_handle_error(type, mci, 1, 0, 0, 0,
+	edac_mc_handle_error(type, mci, errcount, 0, 0, 0,
 			     mci->fake_inject_layer[0],
 			     mci->fake_inject_layer[1],
 			     mci->fake_inject_layer[2],
@@ -944,6 +950,11 @@ int edac_create_debug_nodes(struct mem_ctl_info *mci)
 	if (!d)
 		goto nomem;
 
+	d = debugfs_create_u16("fake_inject_count", S_IRUGO | S_IWUSR, parent,
+				&mci->fake_inject_count);
+	if (!d)
+		goto nomem;
+
 	d = debugfs_create_file("fake_inject", S_IWUSR, parent,
 				&mci->dev,
 				&debug_fake_inject_fops);
diff --git a/trunk/include/linux/edac.h b/trunk/include/linux/edac.h
index 6677af853e30..bab9f8473dc1 100644
--- a/trunk/include/linux/edac.h
+++ b/trunk/include/linux/edac.h
@@ -665,6 +665,7 @@ struct mem_ctl_info {
 	struct dentry *debugfs;
 	u8 fake_inject_layer[EDAC_MAX_LAYERS];
 	u32 fake_inject_ue;
+	u16 fake_inject_count;
 #endif
 };