2.5.26 fails with missing symbols fg_console and kbd_table if
enabling Magic SysRq but disabling virtual terminals. The
trivial patch below fixes this.
- Werner
------------------------------------ patch ------------------------------------
--- linux-2.5.26/drivers/char/sysrq.c.orig Thu Jul 18 12:55:09 2002
+++ linux-2.5.26/drivers/char/sysrq.c Thu Jul 18 12:55:15 2002
@@ -74,7 +74,6 @@
help_msg: "saK",
action_msg: "SAK",
};
-#endif
/* unraw sysrq handler */
@@ -91,6 +90,7 @@
help_msg: "unRaw",
action_msg: "Keyboard mode set to XLATE",
};
+#endif /* CONFIG_VT */
/* reboot sysrq handler */
@@ -371,7 +371,9 @@
as 'Off' at init time */
/* p */ &sysrq_showregs_op,
/* q */ NULL,
+#ifdef CONFIG_VT
/* r */ &sysrq_unraw_op,
+#endif
/* s */ &sysrq_sync_op,
/* t */ &sysrq_showstate_op,
/* u */ &sysrq_mountro_op,
--
_________________________________________________________________________
/ Werner Almesberger, Buenos Aires, Argentina [email protected] /
/_http://icapeople.epfl.ch/almesber/_____________________________________/
On Thu, Jul 18, 2002 at 10:06:35PM -0300, Werner Almesberger wrote:
> 2.5.26 fails with missing symbols fg_console and kbd_table if
> enabling Magic SysRq but disabling virtual terminals. The
> trivial patch below fixes this.
I posted a fix for this on July 17th. However, yours looks better.
James?
> ------------------------------------ patch ------------------------------------
--- linux-2.5.26/drivers/char/sysrq.c.orig Thu Jul 18 12:55:09 2002
+++ linux-2.5.26/drivers/char/sysrq.c Thu Jul 18 12:55:15 2002
@@ -74,7 +74,6 @@
help_msg: "saK",
action_msg: "SAK",
};
-#endif
/* unraw sysrq handler */
@@ -91,6 +90,7 @@
help_msg: "unRaw",
action_msg: "Keyboard mode set to XLATE",
};
+#endif /* CONFIG_VT */
/* reboot sysrq handler */
@@ -371,7 +371,9 @@
as 'Off' at init time */
/* p */ &sysrq_showregs_op,
/* q */ NULL,
+#ifdef CONFIG_VT
/* r */ &sysrq_unraw_op,
+#endif
/* s */ &sysrq_sync_op,
/* t */ &sysrq_showstate_op,
/* u */ &sysrq_mountro_op,
> --
> _________________________________________________________________________
> / Werner Almesberger, Buenos Aires, Argentina [email protected] /
> /_http://icapeople.epfl.ch/almesber/_____________________________________/
> -
> 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/
--
Russell King ([email protected]) The developer of ARM Linux
http://www.arm.linux.org.uk/personal/aboutme.html
On Fri, Jul 19, 2002 at 09:10:17AM +0100, Russell King wrote:
> @@ -371,7 +371,9 @@
> as 'Off' at init time */
> /* p */ &sysrq_showregs_op,
> /* q */ NULL,
> +#ifdef CONFIG_VT
> /* r */ &sysrq_unraw_op,
> +#endif
Shouldn't that be something more like?
+#ifdef CONFIG_VT
/* r */ &sysrq_unraw_op,
+#else
+/* r */ NULL,
+#endif
--
//anders/g
Anders Gustafsson wrote:
> Shouldn't that be something more like?
>
> +#ifdef CONFIG_VT
> /* r */ &sysrq_unraw_op,
> +#else
> +/* r */ NULL,
> +#endif
Argl, I'm an idiot. Yes, you're absolutely right. Corrected patch
below.
- Werner
------------------------------------ patch ------------------------------------
--- linux-2.5.26/drivers/char/sysrq.c.orig Fri Jul 19 08:37:18 2002
+++ linux-2.5.26/drivers/char/sysrq.c Fri Jul 19 08:37:53 2002
@@ -74,7 +74,6 @@
help_msg: "saK",
action_msg: "SAK",
};
-#endif
/* unraw sysrq handler */
@@ -91,6 +90,7 @@
help_msg: "unRaw",
action_msg: "Keyboard mode set to XLATE",
};
+#endif /* CONFIG_VT */
/* reboot sysrq handler */
@@ -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,
--
_________________________________________________________________________
/ Werner Almesberger, Buenos Aires, Argentina [email protected] /
/_http://icapeople.epfl.ch/almesber/_____________________________________/
> > 2.5.26 fails with missing symbols fg_console and kbd_table if
> > enabling Magic SysRq but disabling virtual terminals. The
> > trivial patch below fixes this.
>
> I posted a fix for this on July 17th. However, yours looks better.
> James?
Applied. I will push the changes to Linus. I have other updates as well. I
will post soon.