diff options
author | David Mosberger-Tang <davidm@hpl.hp.com> | 2005-06-09 22:40:00 -0700 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-06-28 09:58:29 -0700 |
commit | 819c67e69c4e0062787e27dd989f5f9d00d4834e (patch) | |
tree | bdbc12f883db46bb985dcf55e28765ad4b8353b0 /arch | |
parent | c1ffb6a8aaed45ba2dc0a8f09241b0a96f9955ba (diff) | |
download | blackbird-obmc-linux-819c67e69c4e0062787e27dd989f5f9d00d4834e.tar.gz blackbird-obmc-linux-819c67e69c4e0062787e27dd989f5f9d00d4834e.zip |
[IA64] Replace stale KDB-code with useful MAGIC_SYSRQ code in simserial.c
Patch makes it possible to use the "F4" function key to do
magic sysrq in the HP Ski simulator.
Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/hp/sim/simserial.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c index 786e70718ce4..7a8ae0f4b387 100644 --- a/arch/ia64/hp/sim/simserial.c +++ b/arch/ia64/hp/sim/simserial.c @@ -30,6 +30,7 @@ #include <linux/module.h> #include <linux/serial.h> #include <linux/serialP.h> +#include <linux/sysrq.h> #include <asm/irq.h> #include <asm/hw_irq.h> @@ -149,12 +150,17 @@ static void receive_chars(struct tty_struct *tty, struct pt_regs *regs) seen_esc = 2; continue; } else if ( seen_esc == 2 ) { - if ( ch == 'P' ) show_state(); /* F1 key */ -#ifdef CONFIG_KDB - if ( ch == 'S' ) - kdb(KDB_REASON_KEYBOARD, 0, (kdb_eframe_t) regs); + if ( ch == 'P' ) /* F1 */ + show_state(); +#ifdef CONFIG_MAGIC_SYSRQ + if ( ch == 'S' ) { /* F4 */ + do + ch = ia64_ssc(0, 0, 0, 0, + SSC_GETCHAR); + while (!ch); + handle_sysrq(ch, regs, NULL); + } #endif - seen_esc = 0; continue; } |