Commit b51882df authored by Linus Torvalds's avatar Linus Torvalds

Automerge

parents 4b1191c8 1fec6dbe
......@@ -645,7 +645,7 @@ static _INLINE_ void receive_chars(struct async_struct *info,
if (break_pressed && info->line == sercons.index) {
if (ch != 0 &&
time_before(jiffies, break_pressed + HZ*5)) {
handle_sysrq(ch, regs, NULL, NULL);
handle_sysrq(ch, regs, NULL);
break_pressed = 0;
goto ignore_char;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment