Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 5053
b: refs/heads/master
c: 804ebf4
h: refs/heads/master
i:
  5051: 3098b0c
v: v3
  • Loading branch information
Eric W. Biederman authored and Linus Torvalds committed Jul 26, 2005
1 parent de2cc51 commit 58e6376
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 970d32443e3d0be57a5cdc3de3752f528424b73d
refs/heads/master: 804ebf46d51653e736108074473d9493398f2df9
2 changes: 1 addition & 1 deletion trunk/drivers/serial/68328serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ static _INLINE_ void receive_chars(struct m68k_serial *info, struct pt_regs *reg
/* show_net_buffers(); */
return;
} else if (ch == 0x12) { /* ^R */
machine_restart(NULL);
emergency_restart();
return;
#endif /* CONFIG_MAGIC_SYSRQ */
}
Expand Down

0 comments on commit 58e6376

Please sign in to comment.