2004-11-12 22:28:00

by Matt Mackall

Subject: [PATCH] include ordering breaks sysrq on 8250 serial

This has been pestering me for a couple days, finally dug into it:

serial_8250.h was including serial_core.h before SUPPORT_SYSRQ was
getting set up. I suspect this problem exists elsewhere. Tested
against latest bk snapshot.

Signed-off-by: Matt Mackall <[email protected]>

Index: l-bk20/drivers/serial/8250.c
===================================================================
--- l-bk20.orig/drivers/serial/8250.c Fri Nov 12 13:03:25 2004
+++ l-bk20/drivers/serial/8250.c Fri Nov 12 14:19:04 2004
@@ -20,6 +20,11 @@
* membase is an 'ioremapped' cookie.
*/
#include <linux/config.h>
+
+#if defined(CONFIG_SERIAL_8250_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/tty.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"



--
Mathematics is the supreme nostalgia of our time.

2004-11-12 22:34:46

by Zwane Mwaikambo

Subject: Re: [PATCH] include ordering breaks sysrq on 8250 serial

On Fri, 12 Nov 2004, Matt Mackall wrote:

> This has been pestering me for a couple days, finally dug into it:
>
> serial_8250.h was including serial_core.h before SUPPORT_SYSRQ was
> getting set up. I suspect this problem exists elsewhere. Tested
> against latest bk snapshot.

Thanks! I tried using it and thought perhaps i had finally conceded to the
little men in my head!