git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
i386
/
mach-visws
/
reboot.c
diff --git
a/arch/i386/mach-visws/reboot.c
b/arch/i386/mach-visws/reboot.c
index
3a81e90
..
99332ab
100644
(file)
--- a/
arch/i386/mach-visws/reboot.c
+++ b/
arch/i386/mach-visws/reboot.c
@@
-1,19
+1,22
@@
#include <linux/module.h>
#include <linux/smp.h>
#include <linux/delay.h>
#include <linux/module.h>
#include <linux/smp.h>
#include <linux/delay.h>
-#include <linux/platform.h>
#include <asm/io.h>
#include "piix4.h"
void (*pm_power_off)(void);
#include <asm/io.h>
#include "piix4.h"
void (*pm_power_off)(void);
+EXPORT_SYMBOL(pm_power_off);
-void machine_
restart(char * __unuse
d)
+void machine_
shutdown(voi
d)
{
#ifdef CONFIG_SMP
smp_send_stop();
#endif
{
#ifdef CONFIG_SMP
smp_send_stop();
#endif
+}
+void machine_emergency_restart(void)
+{
/*
* Visual Workstations restart after this
* register is poked on the PIIX4
/*
* Visual Workstations restart after this
* register is poked on the PIIX4
@@
-21,7
+24,11
@@
void machine_restart(char * __unused)
outb(PIIX4_RESET_VAL, PIIX4_RESET_PORT);
}
outb(PIIX4_RESET_VAL, PIIX4_RESET_PORT);
}
-EXPORT_SYMBOL(machine_restart);
+void machine_restart(char * __unused)
+{
+ machine_shutdown();
+ machine_emergency_restart();
+}
void machine_power_off(void)
{
void machine_power_off(void)
{
@@
-42,10
+49,7
@@
void machine_power_off(void)
outl(PIIX_SPECIAL_STOP, 0xCFC);
}
outl(PIIX_SPECIAL_STOP, 0xCFC);
}
-EXPORT_SYMBOL(machine_power_off);
-
void machine_halt(void)
{
}
void machine_halt(void)
{
}
-EXPORT_SYMBOL(machine_halt);