projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-fixes'
[cascardo/linux.git]
/
arch
/
powerpc
/
kernel
/
prom_init.c
diff --git
a/arch/powerpc/kernel/prom_init.c
b/arch/powerpc/kernel/prom_init.c
index
7881ec9
..
ec7153f
100644
(file)
--- a/
arch/powerpc/kernel/prom_init.c
+++ b/
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
*/