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>2015-11-02 11:46:48 +0000
commit870b5c2bd8355b602bb01a24e9fcec8e576d63f3 (patch)
tree37db563247e96bcac147bf3f83d56bfb740eda3b
parent7a35b58a73a962004b5c57fce282a6dfdd4b55e3 (diff)
downloadlinux-dev/baseline.tar.gz
serial: Hack to prevent SysRq timeouts on the simulatordev/baseline
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 ffd1719b9969..fa9a5582fa82 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -501,7 +501,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;