2002-08-27 02:03:56

by David Gibson

Subject: [TRIVIAL] Compile fix for magic sysrq and !CONFIG_VT

Linus, please apply. This fixes compilation of the magic sysrq code
when compiled without CONFIG_VT.

diff -urN /home/dgibson/kernel/linuxppc-2.5/drivers/char/sysrq.c linux-bluefish/drivers/char/sysrq.c
--- /home/dgibson/kernel/linuxppc-2.5/drivers/char/sysrq.c 2002-07-16 09:13:58.000000000 +1000
+++ linux-bluefish/drivers/char/sysrq.c 2002-08-02 16:36:30.000000000 +1000
@@ -76,7 +76,7 @@
};
#endif

-
+#ifdef CONFIG_VT
/* unraw sysrq handler */
static void sysrq_handle_unraw(int key, struct pt_regs *pt_regs,
struct tty_struct *tty)
@@ -91,7 +91,7 @@
help_msg: "unRaw",
action_msg: "Keyboard mode set to XLATE",
};
-
+#endif /* CONFIG_VT */

/* reboot sysrq handler */
static void sysrq_handle_reboot(int key, struct pt_regs *pt_regs,
@@ -371,7 +371,11 @@
as 'Off' at init time */
/* p */ &sysrq_showregs_op,
/* q */ NULL,
+#ifdef CONFIG_VT
/* r */ &sysrq_unraw_op,
+#else
+/* r */ NULL,
+#endif
/* s */ &sysrq_sync_op,
/* t */ &sysrq_showstate_op,
/* u */ &sysrq_mountro_op,


--
David Gibson | For every complex problem there is a
[email protected] | solution which is simple, neat and
| wrong.
http://www.ozlabs.org/people/dgibson

2002-08-28 18:59:56

by James Simmons

Subject: Re: [TRIVIAL] Compile fix for magic sysrq and !CONFIG_VT

> Linus, please apply. This fixes compilation of the magic sysrq code
> when compiled without CONFIG_VT.

Ug. I have had this fix for awhile in the console BK tree. That and
several other ones. I'm merging my tree with 2.5.32 right now and I will
push it to linus as soon as I'm done tetsing.


> diff -urN /home/dgibson/kernel/linuxppc-2.5/drivers/char/sysrq.c linux-bluefish/drivers/char/sysrq.c
> --- /home/dgibson/kernel/linuxppc-2.5/drivers/char/sysrq.c 2002-07-16 09:13:58.000000000 +1000
> +++ linux-bluefish/drivers/char/sysrq.c 2002-08-02 16:36:30.000000000 +1000
> @@ -76,7 +76,7 @@
> };
> #endif
>
> -
> +#ifdef CONFIG_VT
> /* unraw sysrq handler */
> static void sysrq_handle_unraw(int key, struct pt_regs *pt_regs,
> struct tty_struct *tty)
> @@ -91,7 +91,7 @@
> help_msg: "unRaw",
> action_msg: "Keyboard mode set to XLATE",
> };
> -
> +#endif /* CONFIG_VT */
>
> /* reboot sysrq handler */
> static void sysrq_handle_reboot(int key, struct pt_regs *pt_regs,
> @@ -371,7 +371,11 @@
> as 'Off' at init time */
> /* p */ &sysrq_showregs_op,
> /* q */ NULL,
> +#ifdef CONFIG_VT
> /* r */ &sysrq_unraw_op,
> +#else
> +/* r */ NULL,
> +#endif
> /* s */ &sysrq_sync_op,
> /* t */ &sysrq_showstate_op,
> /* u */ &sysrq_mountro_op,
>
>
> --
> David Gibson | For every complex problem there is a
> [email protected] | solution which is simple, neat and
> | wrong.
> http://www.ozlabs.org/people/dgibson
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>

2002-08-29 00:11:55

by David Gibson

Subject: Re: [TRIVIAL] Compile fix for magic sysrq and !CONFIG_VT

On Wed, Aug 28, 2002 at 11:58:07AM -0700, James Simmons wrote:
>
> > Linus, please apply. This fixes compilation of the magic sysrq code
> > when compiled without CONFIG_VT.
>
> Ug. I have had this fix for awhile in the console BK tree. That and
> several other ones. I'm merging my tree with 2.5.32 right now and I will
> push it to linus as soon as I'm done tetsing.

Ok, great. Sorry I didn't get in touch with you first, but it wasn't
obvious who the right person was.

--
David Gibson | For every complex problem there is a
[email protected] | solution which is simple, neat and
| wrong.
http://www.ozlabs.org/people/dgibson