The patch titled sysrq: emergency thaw only if CONFIG_BLOCK enabled has been removed from the -mm tree. Its filename was filesystem-freeze-allow-sysrq-emergency-thaw-to-thaw-frozen-filesystems-fix.patch This patch was dropped because it was folded into filesystem-freeze-allow-sysrq-emergency-thaw-to-thaw-frozen-filesystems.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: sysrq: emergency thaw only if CONFIG_BLOCK enabled 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> Cc: Eric Sandeen <sandeen@xxxxxxxxxx> Cc: Takashi Sato <t-sato@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/char/sysrq.c | 6 ++++++ 1 file changed, 6 insertions(+) diff -puN drivers/char/sysrq.c~filesystem-freeze-allow-sysrq-emergency-thaw-to-thaw-frozen-filesystems-fix drivers/char/sysrq.c --- a/drivers/char/sysrq.c~filesystem-freeze-allow-sysrq-emergency-thaw-to-thaw-frozen-filesystems-fix +++ a/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 */ _ Patches currently in -mm which might be from randy.dunlap@xxxxxxxxxx are origin.patch maintainers-general-listsopenfabricsorg-is-moderated.patch atyfb-fix-config_-namespace-violations.patch linux-next.patch uv-fix-header-struct-usage.patch kgdb-fix-kernel-doc-error.patch auditsc-fix-kernel-doc-notation.patch input-ad7879-touchscreen-driver-dont-use-bus_id.patch es-input-allow-certain-ev_abs-events-to-bypass-all-filtering-fix.patch e1000e-make-e1000e-default-to-the-same-kconfig-setting-as-e1000.patch esp-fix-section-mismatch-warning.patch vfs-update-fsh-to-use-inline-functions-when-no-file-locking-set.patch vfs-further-changes-from-macro-to-inline-function-in-fsh.patch max3100-spi-uart-driver.patch filesystem-freeze-allow-sysrq-emergency-thaw-to-thaw-frozen-filesystems.patch filesystem-freeze-allow-sysrq-emergency-thaw-to-thaw-frozen-filesystems-fix.patch atyfb-fix-header-file-trailing-whitespace.patch documentation-ignore-byproducts-from-latex.patch kexec-add-dmesg-log-symbols-to-proc-vmcoreinfo-lists-fix-fix.patch linuxpps-core-support.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html