Re: [PATCH] CONFIG_MAGIC_SYSRQ without CONFIG_VT broken in 2.5.26

[Werner Almesberger]

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         [e-mail] /
/_http://icapeople.epfl.ch/almesber/_____________________________________/