890-uart_optional_sysrq.patch 835 B

12345678910111213141516171819202122232425
  1. --- a/lib/Kconfig.debug
  2. +++ b/lib/Kconfig.debug
  3. @@ -382,6 +382,11 @@ config MAGIC_SYSRQ_DEFAULT_ENABLE
  4. This may be set to 1 or 0 to enable or disable them all, or
  5. to a bitmask as described in Documentation/sysrq.txt.
  6. +config MAGIC_SYSRQ_SERIAL
  7. + bool "Enable magic SysRq key over serial"
  8. + depends on MAGIC_SYSRQ
  9. + default y
  10. +
  11. config DEBUG_KERNEL
  12. bool "Kernel debugging"
  13. help
  14. --- a/include/linux/serial_core.h
  15. +++ b/include/linux/serial_core.h
  16. @@ -426,7 +426,7 @@ extern void uart_handle_cts_change(struc
  17. extern void uart_insert_char(struct uart_port *port, unsigned int status,
  18. unsigned int overrun, unsigned int ch, unsigned int flag);
  19. -#ifdef SUPPORT_SYSRQ
  20. +#if defined(SUPPORT_SYSRQ) && defined(CONFIG_MAGIC_SYSRQ_SERIAL)
  21. static inline int
  22. uart_handle_sysrq_char(struct uart_port *port, unsigned int ch)
  23. {