Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 5049
b: refs/heads/master
c: 2f048ea
h: refs/heads/master
i:
  5047: 2c692d2
v: v3
  • Loading branch information
Eric W. Biederman authored and Linus Torvalds committed Jul 26, 2005
1 parent 7bef995 commit 28daf28
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 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: ff31977782a05504f2586ec9e3e5ab4b09a4c893
refs/heads/master: 2f048ea81df94f72dee0d42b3d9b941c03b8c9c5
9 changes: 4 additions & 5 deletions trunk/kernel/panic.c
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,11 @@ NORET_TYPE void panic(const char * fmt, ...)
mdelay(1);
i++;
}
/*
* Should we run the reboot notifier. For the moment Im
* choosing not too. It might crash, be corrupt or do
* more harm than good for other reasons.
/* This will not be a clean reboot, with everything
* shutting down. But if there is a chance of
* rebooting the system it will be rebooted.
*/
machine_restart(NULL);
emergency_restart();
}
#ifdef __sparc__
{
Expand Down

0 comments on commit 28daf28

Please sign in to comment.