[PATCH -mmotm/resend] sysrq: emergency thaw only if CONFIG_BLOCKenabled

[Randy Dunlap]

From: Randy Dunlap <randy.dunlap@xxxxxxxxxx>

sysrq's new emergency_thaw_all() is only available when CONFIG_BLOCK=y:

drivers/char/sysrq.c:351: error: implicit declaration of function 'emergency_thaw_all'

Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
---
 drivers/char/sysrq.c |    6 ++++++
 1 file changed, 6 insertions(+)

--- mmotm-2009-0131-0108.orig/drivers/char/sysrq.c
+++ mmotm-2009-0131-0108/drivers/char/sysrq.c
@@ -346,6 +346,7 @@ static struct sysrq_key_op sysrq_moom_op
 	.enable_mask	= SYSRQ_ENABLE_SIGNAL,
 };
 
+#ifdef CONFIG_BLOCK
 static void sysrq_handle_thaw(int key, struct tty_struct *tty)
 {
 	emergency_thaw_all();
@@ -356,6 +357,7 @@ static struct sysrq_key_op sysrq_thaw_op
 	.action_msg	= "Emergency Thaw of all frozen filesystems",
 	.enable_mask	= SYSRQ_ENABLE_SIGNAL,
 };
+#endif
 
 static void sysrq_handle_kill(int key, struct tty_struct *tty)
 {
@@ -409,7 +411,11 @@ static struct sysrq_key_op *sysrq_key_ta
 	NULL,				/* g */
 	NULL,				/* h - reserved for help */
 	&sysrq_kill_op,			/* i */
+#ifdef CONFIG_BLOCK
 	&sysrq_thaw_op,			/* j */
+#else
+	NULL,				/* j */
+#endif
 	&sysrq_SAK_op,			/* k */
 #ifdef CONFIG_SMP
 	&sysrq_showallcpus_op,		/* l */

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/