---

yaml --- r: 361411 b: refs/heads/master c: 52319b4 h: refs/heads/master i: 361409: 8572919 361407: b1b5ce9 v: v3
git-mirror · Mar 11, 2013 · 26ac25b · 26ac25b
1 parent 9f7d3ea
commit 26ac25b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aaaf9cf71c43f42285f2b1a5b54c9306f3cc3150
+refs/heads/master: 52319b457cd78aa891f5947cf2237dd5f6a4c52d
diff --git a/trunk/drivers/s390/char/sclp_cmd.c b/trunk/drivers/s390/char/sclp_cmd.c
@@ -627,6 +627,8 @@ static int __init sclp_detect_standby_memory(void)
 	struct read_storage_sccb *sccb;
 	int i, id, assigned, rc;
 
+	if (OLDMEM_BASE) /* No standby memory in kdump mode */
+		return 0;
 	if (!early_read_info_sccb_valid)
 		return 0;
 	if ((sclp_facilities & 0xe00000000000ULL) != 0xe00000000000ULL)