Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 5042
b: refs/heads/master
c: 7c90347
h: refs/heads/master
v: v3
  • Loading branch information
Eric W. Biederman authored and Linus Torvalds committed Jul 26, 2005
1 parent bc5df4e commit c935db8
Show file tree
Hide file tree
Showing 28 changed files with 167 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: abcd9e51f5b832439b119d530db1353c12fd4073
refs/heads/master: 7c9034735eccbf82608a4602c59aaf6053ea9416
6 changes: 6 additions & 0 deletions trunk/include/asm-alpha/emergency-restart.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef _ASM_EMERGENCY_RESTART_H
#define _ASM_EMERGENCY_RESTART_H

#include <asm-generic/emergency-restart.h>

#endif /* _ASM_EMERGENCY_RESTART_H */
6 changes: 6 additions & 0 deletions trunk/include/asm-arm/emergency-restart.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef _ASM_EMERGENCY_RESTART_H
#define _ASM_EMERGENCY_RESTART_H

#include <asm-generic/emergency-restart.h>

#endif /* _ASM_EMERGENCY_RESTART_H */
6 changes: 6 additions & 0 deletions trunk/include/asm-arm26/emergency-restart.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef _ASM_EMERGENCY_RESTART_H
#define _ASM_EMERGENCY_RESTART_H

#include <asm-generic/emergency-restart.h>

#endif /* _ASM_EMERGENCY_RESTART_H */
6 changes: 6 additions & 0 deletions trunk/include/asm-cris/emergency-restart.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef _ASM_EMERGENCY_RESTART_H
#define _ASM_EMERGENCY_RESTART_H

#include <asm-generic/emergency-restart.h>

#endif /* _ASM_EMERGENCY_RESTART_H */
6 changes: 6 additions & 0 deletions trunk/include/asm-frv/emergency-restart.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef _ASM_EMERGENCY_RESTART_H
#define _ASM_EMERGENCY_RESTART_H

#include <asm-generic/emergency-restart.h>

#endif /* _ASM_EMERGENCY_RESTART_H */
9 changes: 9 additions & 0 deletions trunk/include/asm-generic/emergency-restart.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
#define _ASM_GENERIC_EMERGENCY_RESTART_H

static inline void machine_emergency_restart(void)
{
machine_restart(NULL);
}

#endif /* _ASM_GENERIC_EMERGENCY_RESTART_H */
6 changes: 6 additions & 0 deletions trunk/include/asm-h8300/emergency-restart.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef _ASM_EMERGENCY_RESTART_H
#define _ASM_EMERGENCY_RESTART_H

#include <asm-generic/emergency-restart.h>

#endif /* _ASM_EMERGENCY_RESTART_H */
6 changes: 6 additions & 0 deletions trunk/include/asm-i386/emergency-restart.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef _ASM_EMERGENCY_RESTART_H
#define _ASM_EMERGENCY_RESTART_H

#include <asm-generic/emergency-restart.h>

#endif /* _ASM_EMERGENCY_RESTART_H */
6 changes: 6 additions & 0 deletions trunk/include/asm-ia64/emergency-restart.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef _ASM_EMERGENCY_RESTART_H
#define _ASM_EMERGENCY_RESTART_H

#include <asm-generic/emergency-restart.h>

#endif /* _ASM_EMERGENCY_RESTART_H */
6 changes: 6 additions & 0 deletions trunk/include/asm-m32r/emergency-restart.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef _ASM_EMERGENCY_RESTART_H
#define _ASM_EMERGENCY_RESTART_H

#include <asm-generic/emergency-restart.h>

#endif /* _ASM_EMERGENCY_RESTART_H */
6 changes: 6 additions & 0 deletions trunk/include/asm-m68k/emergency-restart.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef _ASM_EMERGENCY_RESTART_H
#define _ASM_EMERGENCY_RESTART_H

#include <asm-generic/emergency-restart.h>

#endif /* _ASM_EMERGENCY_RESTART_H */
6 changes: 6 additions & 0 deletions trunk/include/asm-m68knommu/emergency-restart.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef _ASM_EMERGENCY_RESTART_H
#define _ASM_EMERGENCY_RESTART_H

#include <asm-generic/emergency-restart.h>

#endif /* _ASM_EMERGENCY_RESTART_H */
6 changes: 6 additions & 0 deletions trunk/include/asm-mips/emergency-restart.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef _ASM_EMERGENCY_RESTART_H
#define _ASM_EMERGENCY_RESTART_H

#include <asm-generic/emergency-restart.h>

#endif /* _ASM_EMERGENCY_RESTART_H */
6 changes: 6 additions & 0 deletions trunk/include/asm-parisc/emergency-restart.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef _ASM_EMERGENCY_RESTART_H
#define _ASM_EMERGENCY_RESTART_H

#include <asm-generic/emergency-restart.h>

#endif /* _ASM_EMERGENCY_RESTART_H */
6 changes: 6 additions & 0 deletions trunk/include/asm-ppc/emergency-restart.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef _ASM_EMERGENCY_RESTART_H
#define _ASM_EMERGENCY_RESTART_H

#include <asm-generic/emergency-restart.h>

#endif /* _ASM_EMERGENCY_RESTART_H */
6 changes: 6 additions & 0 deletions trunk/include/asm-ppc64/emergency-restart.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef _ASM_EMERGENCY_RESTART_H
#define _ASM_EMERGENCY_RESTART_H

#include <asm-generic/emergency-restart.h>

#endif /* _ASM_EMERGENCY_RESTART_H */
6 changes: 6 additions & 0 deletions trunk/include/asm-s390/emergency-restart.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef _ASM_EMERGENCY_RESTART_H
#define _ASM_EMERGENCY_RESTART_H

#include <asm-generic/emergency-restart.h>

#endif /* _ASM_EMERGENCY_RESTART_H */
6 changes: 6 additions & 0 deletions trunk/include/asm-sh/emergency-restart.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef _ASM_EMERGENCY_RESTART_H
#define _ASM_EMERGENCY_RESTART_H

#include <asm-generic/emergency-restart.h>

#endif /* _ASM_EMERGENCY_RESTART_H */
6 changes: 6 additions & 0 deletions trunk/include/asm-sh64/emergency-restart.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef _ASM_EMERGENCY_RESTART_H
#define _ASM_EMERGENCY_RESTART_H

#include <asm-generic/emergency-restart.h>

#endif /* _ASM_EMERGENCY_RESTART_H */
6 changes: 6 additions & 0 deletions trunk/include/asm-sparc/emergency-restart.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef _ASM_EMERGENCY_RESTART_H
#define _ASM_EMERGENCY_RESTART_H

#include <asm-generic/emergency-restart.h>

#endif /* _ASM_EMERGENCY_RESTART_H */
6 changes: 6 additions & 0 deletions trunk/include/asm-sparc64/emergency-restart.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef _ASM_EMERGENCY_RESTART_H
#define _ASM_EMERGENCY_RESTART_H

#include <asm-generic/emergency-restart.h>

#endif /* _ASM_EMERGENCY_RESTART_H */
6 changes: 6 additions & 0 deletions trunk/include/asm-um/emergency-restart.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef _ASM_EMERGENCY_RESTART_H
#define _ASM_EMERGENCY_RESTART_H

#include <asm-generic/emergency-restart.h>

#endif /* _ASM_EMERGENCY_RESTART_H */
6 changes: 6 additions & 0 deletions trunk/include/asm-v850/emergency-restart.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef _ASM_EMERGENCY_RESTART_H
#define _ASM_EMERGENCY_RESTART_H

#include <asm-generic/emergency-restart.h>

#endif /* _ASM_EMERGENCY_RESTART_H */
6 changes: 6 additions & 0 deletions trunk/include/asm-x86_64/emergency-restart.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef _ASM_EMERGENCY_RESTART_H
#define _ASM_EMERGENCY_RESTART_H

#include <asm-generic/emergency-restart.h>

#endif /* _ASM_EMERGENCY_RESTART_H */
6 changes: 6 additions & 0 deletions trunk/include/asm-xtensa/emergency-restart.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef _ASM_EMERGENCY_RESTART_H
#define _ASM_EMERGENCY_RESTART_H

#include <asm-generic/emergency-restart.h>

#endif /* _ASM_EMERGENCY_RESTART_H */
7 changes: 7 additions & 0 deletions trunk/include/linux/reboot.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,13 @@ extern void kernel_halt(void);
extern void kernel_power_off(void);
extern void kernel_kexec(void);

/*
* Emergency restart, callable from an interrupt handler.
*/

extern void emergency_restart(void);
#include <asm/emergency-restart.h>

#endif

#endif /* _LINUX_REBOOT_H */
6 changes: 6 additions & 0 deletions trunk/kernel/sys.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,12 @@ asmlinkage long sys_getpriority(int which, int who)
return retval;
}

void emergency_restart(void)
{
machine_emergency_restart();
}
EXPORT_SYMBOL_GPL(emergency_restart);

void kernel_restart(char *cmd)
{
notifier_call_chain(&reboot_notifier_list, SYS_RESTART, cmd);
Expand Down

0 comments on commit c935db8

Please sign in to comment.