2004-11-16 19:20:46

by Steven Rostedt

Subject: [PATCH] sysrq and 8250 serial console 2.6.10-rc1-mm3

I don't know if anyone else caught this, but the sysrq doesn't work with
the serial console for 8250. This is a simple patch, the serial_8250.h
also calls serial_core.h before SUPPORT_SYSRQ is defined. And thus the
inlines in serial core do not support sysrq.

Here's the fix, I was even more paranoid and put the define before all
serial headers.

--- linux-2.6.10-rc1-mm3/drivers/serial/8250.c_orig 2004-11-16 14:07:08.000000000 -0500
+++ linux-2.6.10-rc1-mm3/drivers/serial/8250.c 2004-11-16 14:07:47.000000000 -0500
@@ -27,6 +27,11 @@
#include <linux/init.h>
#include <linux/console.h>
#include <linux/sysrq.h>
+
+#if defined(CONFIG_SERIAL_8250_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
#include <linux/serial_reg.h>
#include <linux/serial.h>
#include <linux/serial_8250.h>
@@ -37,10 +42,6 @@
#include <asm/io.h>
#include <asm/irq.h>

-#if defined(CONFIG_SERIAL_8250_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
#include <linux/serial_core.h>
#include "8250.h"

--
Steven Rostedt
Senior Engineer
Kihon Technologies

2004-11-16 19:40:51

by Russell King

Subject: Re: [PATCH] sysrq and 8250 serial console 2.6.10-rc1-mm3

On Tue, Nov 16, 2004 at 02:17:33PM -0500, Steven Rostedt wrote:
> I don't know if anyone else caught this, but the sysrq doesn't work with
> the serial console for 8250. This is a simple patch, the serial_8250.h
> also calls serial_core.h before SUPPORT_SYSRQ is defined. And thus the
> inlines in serial core do not support sysrq.

Already fixed in 2.6.10-rc2.

Thanks anyway.

--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/
2.6 Serial core