diff options
| author |   Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2007-11-28 16:21:44 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-29 09:24:53 -0800 |
| commit | 68576cf122bc5195c758ed295e78b5858472378a (patch) | |
| tree | 5b6b7cb9608bf757bf3368c808f14bf206eddbe8 /include | |
| parent | dmaengine: correct invalid assumptions in the Kconfig text (diff) | |
| download | linux-dev-68576cf122bc5195c758ed295e78b5858472378a.tar.xz linux-dev-68576cf122bc5195c758ed295e78b5858472378a.zip | |
IP22ZILOG: fix lockup and sysrq
- fix lockup when switching from early console to real console
- make sysrq reliable
- fix panic, if sysrq is issued before console is opened
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips/system.h | 2 | ||||
| -rw-r--r-- | include/linux/serial_core.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h index 1030562d6ea6..a944eda4faf5 100644 --- a/include/asm-mips/system.h +++ b/include/asm-mips/system.h @@ -209,8 +209,6 @@ extern void *set_except_vector(int n, void *addr); extern unsigned long ebase; extern void per_cpu_trap_init(void); -extern int stop_a_enabled; - /* * See include/asm-ia64/system.h; prevents deadlock on SMP * systems. diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 6a5203fb9cf1..9963f81fea9a 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -437,7 +437,7 @@ uart_handle_sysrq_char(struct uart_port *port, unsigned int ch) #ifdef SUPPORT_SYSRQ if (port->sysrq) { if (ch && time_before(jiffies, port->sysrq)) { - handle_sysrq(ch, port->info->tty); + handle_sysrq(ch, port->info ? port->info->tty : NULL); port->sysrq = 0; return 1; } |