From 22f3a05a229b8adfa1efd9e499f8c42ccae44e5f Mon Sep 17 00:00:00 2001
From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
Date: Fri, 22 Oct 2010 14:21:17 -0500
Subject: [PATCH] --- yaml --- r: 221843 b: refs/heads/master c:
 186fb9cf6a1154bc9b071adfd72fcf256285eb26 h: refs/heads/master i:   221841:
 a8c72b0224a9d4d4aa935d21ebcd619da250ed78   221839:
 777c56e52aad4117ece85c81f69a1c0904dc87a8 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/block/cciss.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6b5fac378c46..da68e05a0015 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f442e64b93e16dba6bf9ab7e8dc5a90f6bcd8a85
+refs/heads/master: 186fb9cf6a1154bc9b071adfd72fcf256285eb26
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 2e547bddc5a7..9e761b994b4c 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -4079,6 +4079,11 @@ static int __devinit cciss_find_cfgtables(ctlr_info_t *h)
 static void __devinit cciss_get_max_perf_mode_cmds(struct ctlr_info *h)
 {
 	h->max_commands = readl(&(h->cfgtable->MaxPerformantModeCommands));
+
+	/* Limit commands in memory limited kdump scenario. */
+	if (reset_devices && h->max_commands > 32)
+		h->max_commands = 32;
+
 	if (h->max_commands < 16) {
 		dev_warn(&h->pdev->dev, "Controller reports "
 			"max supported commands of %d, an obvious lie. "