---

yaml --- r: 20063 b: refs/heads/master c: cdc3ee8 h: refs/heads/master i: 20061: 6755c8d 20059: b93bba6 20055: 127f85b 20047: e5468fb 20031: d3caf04 v: v3
git-mirror · Feb 7, 2006 · 7a88737 · 7a88737
1 parent be5b1d7
commit 7a88737
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c20fafa8548917fdbbd95588494498dd901b375
+refs/heads/master: cdc3ee8f2061bafe7593bab0096a0e711408b0f9
diff --git a/trunk/arch/powerpc/kernel/prom_init.c b/trunk/arch/powerpc/kernel/prom_init.c
@@ -2098,6 +2098,10 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
 	 */
 	prom_init_stdout();
 
+	/* Bail if this is a kdump kernel. */
+	if (PHYSICAL_START > 0)
+		prom_panic("Error: You can't boot a kdump kernel from OF!\n");
+
 	/*
 	 * Check for an initrd
 	 */