aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Thompson <daniel.thompson@linaro.org>2015-07-07 16:38:46 +0100
committerDaniel Thompson <daniel.thompson@linaro.org>2017-01-24 11:34:26 +0000
commit160c8c5016218922959c5f67b9e73913834131cd (patch)
tree884db97272ba1791512a32386a623a73b1475de8
parentb3d0fa0d74a66db371f7b04bcb84a763ed8b6293 (diff)
downloadlinux-backport/arm64_nmi-android-3.18.tar.gz
serial: Hack to prevent SysRq timeouts on the simulatorbackport/arm64_nmi-android-3.18
Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>
-rw-r--r--include/linux/serial_core.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 6c86843025f4..59934fa8e042 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -458,7 +458,7 @@ static inline int
uart_handle_sysrq_char(struct uart_port *port, unsigned int ch)
{
if (port->sysrq) {
- if (ch && time_before(jiffies, port->sysrq)) {
+ if (ch /*&& time_before(jiffies, port->sysrq)*/) {
handle_sysrq(ch);
port->sysrq = 0;
return 1;