From 7a88737e3476648af068501a082c104715c5fc78 Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Wed, 25 Jan 2006 21:48:48 +1300
Subject: [PATCH] --- yaml --- r: 20063 b: refs/heads/master c:
 cdc3ee8f2061bafe7593bab0096a0e711408b0f9 h: refs/heads/master i:   20061:
 6755c8d2d18a2678fbc9a1271e39ecc22e763297   20059:
 b93bba644ac020610fa045d5d80248eba3e358c7   20055:
 127f85b29c7ed1eac07854c7666c4ba92e17be33   20047:
 e5468fbcb99d42cf44943f5d4807146a3a3badd6   20031:
 d3caf043652d34719e42bbfea9ba4011548a2ecf v: v3

---
 [refs]                                | 2 +-
 trunk/arch/powerpc/kernel/prom_init.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2477fa77048e..ddec26373bc5 100644
--- 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
index 7881ec96ef11..ec7153f4d47c 100644
--- 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
 	 */