From: Milton Miller <miltonm@bga.com>
Guard the MAGIC_SYSRQ ^O to be just on the console channel. Make the other
channels more transparent.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
drivers/char/hvc_console.c | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff -puN drivers/char/hvc_console.c~hvc_console-magic_sysrq-should-only-be-on-console-channel drivers/char/hvc_console.c
--- 25/drivers/char/hvc_console.c~hvc_console-magic_sysrq-should-only-be-on-console-channel Wed Jul 6 14:00:25 2005
+++ 25-akpm/drivers/char/hvc_console.c Wed Jul 6 14:00:25 2005
@@ -584,14 +584,17 @@ static int hvc_poll(struct hvc_struct *h
}
for (i = 0; i < n; ++i) {
#ifdef CONFIG_MAGIC_SYSRQ
- /* Handle the SysRq Hack */
- if (buf[i] == '\x0f') { /* ^O -- should support a sequence */
- sysrq_pressed = 1;
- continue;
- } else if (sysrq_pressed) {
- handle_sysrq(buf[i], NULL, tty);
- sysrq_pressed = 0;
- continue;
+ if (hp->index == hvc_con_driver.index) {
+ /* Handle the SysRq Hack */
+ /* XXX should support a sequence */
+ if (buf[i] == '\x0f') { /* ^O */
+ sysrq_pressed = 1;
+ continue;
+ } else if (sysrq_pressed) {
+ handle_sysrq(buf[i], NULL, tty);
+ sysrq_pressed = 0;
+ continue;
+ }
}
#endif /* CONFIG_MAGIC_SYSRQ */
tty_insert_flip_char(tty, buf[i], 0);
_