This reverts commit da9a5aa3402db0ff3b57216d8dbf2478e1046cae. 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.
Showing the changes to include/linux (1 of 2 files). Show all
Unified · Split
| @@ -464,7 +464,8 @@ extern void uart_insert_char(struct uart_port *port, unsigned int status, · 463 unmodified lines | ||
| 464 | 464 | |
| 465 | 465 | extern int uart_handle_sysrq_char(struct uart_port *port, unsigned int ch); |
| 466 | 466 | extern int uart_prepare_sysrq_char(struct uart_port *port, unsigned int ch); |
| 467 | −extern void uart_unlock_and_check_sysrq(struct uart_port *port, unsigned long flags); | |
| 467 | +extern void uart_unlock_and_check_sysrq(struct uart_port *port, | |
| 468 | + unsigned long irqflags); | |
| 468 | 469 | extern int uart_handle_break(struct uart_port *port); |
| 469 | 470 | |
| 470 | 471 | /* |