]> git.baikalelectronics.ru Git - kernel.git/commit
Revert "serial: core: Refactor uart_unlock_and_check_sysrq()"
authorJohan Hovold <johan@kernel.org>
Wed, 10 Jun 2020 15:22:30 +0000 (17:22 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 27 Jun 2020 14:16:37 +0000 (16:16 +0200)
commit1e6a838f9da8e7edd36b998fcde8b82dcf721196
tree1b711f0176a9a41c3df775d0bb16a651bb8a6572
parent27ccbc6b386cc81a61203b3524d17bacfe9ca9c8
Revert "serial: core: Refactor uart_unlock_and_check_sysrq()"

This reverts commit c305eab7ea77dd7fec8941744b715a8e5f2a2967.

In order to ease backporting a fix for a sysrq regression, revert this
rewrite which was since added on top.

The other sysrq helpers now bail out early when sysrq is not enabled;
it's better to keep that pattern here as well.

Note that the __releases() attribute won't be needed after the follow-on
fix either.

Fixes: c305eab7ea77 ("serial: core: Refactor uart_unlock_and_check_sysrq()")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20200610152232.16925-2-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/serial_core.c
include/linux/serial_core.h