* [TRIVIAL] Compile fix for magic sysrq and !CONFIG_VT
@ 2002-08-27 2:08 David Gibson
2002-08-28 18:58 ` James Simmons
0 siblings, 1 reply; 3+ messages in thread
From: David Gibson @ 2002-08-27 2:08 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel, trivial
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
david@gibson.dropbear.id.au | solution which is simple, neat and
| wrong.
http://www.ozlabs.org/people/dgibson
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [TRIVIAL] Compile fix for magic sysrq and !CONFIG_VT
2002-08-27 2:08 [TRIVIAL] Compile fix for magic sysrq and !CONFIG_VT David Gibson
@ 2002-08-28 18:58 ` James Simmons
2002-08-29 0:02 ` David Gibson
0 siblings, 1 reply; 3+ messages in thread
From: James Simmons @ 2002-08-28 18:58 UTC (permalink / raw)
To: David Gibson; +Cc: Linus Torvalds, linux-kernel, trivial
> 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
> david@gibson.dropbear.id.au | 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 majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [TRIVIAL] Compile fix for magic sysrq and !CONFIG_VT
2002-08-28 18:58 ` James Simmons
@ 2002-08-29 0:02 ` David Gibson
0 siblings, 0 replies; 3+ messages in thread
From: David Gibson @ 2002-08-29 0:02 UTC (permalink / raw)
To: James Simmons; +Cc: linux-kernel
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
david@gibson.dropbear.id.au | solution which is simple, neat and
| wrong.
http://www.ozlabs.org/people/dgibson
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2002-08-29 0:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-08-27 2:08 [TRIVIAL] Compile fix for magic sysrq and !CONFIG_VT David Gibson
2002-08-28 18:58 ` James Simmons
2002-08-29 0:02 ` David Gibson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).