diff options
author | David S. Miller <davem@davemloft.net> | 2017-02-23 08:27:30 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-02-23 08:27:30 -0800 |
commit | 0d88b86694e0b176c1b9ca10cee95863065e2471 (patch) | |
tree | 9637fa692398887c369983b5fba391b3c83c199a /kernel/panic.c | |
parent | f41e54616ca1a199f6c17228f26082ccdaaab3de (diff) | |
parent | 4cfe140618b99e653134598de9f18b48743549ec (diff) |
Merge branch 'sparc64-jump-to-boot-prom'
Vijay Kumar says:
====================
sparc64: Jump to boot prom from console on panic
V3 changes:
- patch 02/04: Added SERIAL_SUNHV conditional group for
sunhv_migrate_hvcons_irq in smp_send_stop().
V2 changes:
- Added cover letter patch
Currently Stop-A (L1A) does not make the kernel switch to OBP on panic. This
patchset addresses this issue. Also, now we can cause a jump to OBP by sending
'break' twice from sunhv console. On bare metal, one can send a break by
typing Esc + 'B' + Sysrq (or whatever). On LDOM, press Ctrl + ] in telnet,
and then "send break" at the telnet prompt.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/panic.c')
-rw-r--r-- | kernel/panic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index b95959733ce0..3ec16e603e88 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -273,7 +273,8 @@ void panic(const char *fmt, ...) extern int stop_a_enabled; /* Make sure the user can actually press Stop-A (L1-A) */ stop_a_enabled = 1; - pr_emerg("Press Stop-A (L1-A) to return to the boot prom\n"); + pr_emerg("Press Stop-A (L1-A) from sun keyboard or send break\n" + "twice on console to return to the boot prom\n"); } #endif #if defined(CONFIG_S390) |