Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

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;
                         }