|
@@ -326,7 +326,7 @@ static inline void kb_wait(void)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-void machine_emergency_restart(void)
|
|
|
+static void native_machine_emergency_restart(void)
|
|
|
{
|
|
|
int i;
|
|
|
|
|
@@ -376,7 +376,7 @@ void machine_emergency_restart(void)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-void machine_shutdown(void)
|
|
|
+static void native_machine_shutdown(void)
|
|
|
{
|
|
|
/* Stop the cpus and apics */
|
|
|
#ifdef CONFIG_SMP
|
|
@@ -420,7 +420,7 @@ void machine_shutdown(void)
|
|
|
#endif
|
|
|
}
|
|
|
|
|
|
-void machine_restart(char *__unused)
|
|
|
+static void native_machine_restart(char *__unused)
|
|
|
{
|
|
|
printk("machine restart\n");
|
|
|
|
|
@@ -429,11 +429,11 @@ void machine_restart(char *__unused)
|
|
|
machine_emergency_restart();
|
|
|
}
|
|
|
|
|
|
-void machine_halt(void)
|
|
|
+static void native_machine_halt(void)
|
|
|
{
|
|
|
}
|
|
|
|
|
|
-void machine_power_off(void)
|
|
|
+static void native_machine_power_off(void)
|
|
|
{
|
|
|
if (pm_power_off) {
|
|
|
if (!reboot_force)
|
|
@@ -443,9 +443,35 @@ void machine_power_off(void)
|
|
|
}
|
|
|
|
|
|
struct machine_ops machine_ops = {
|
|
|
- .power_off = machine_power_off,
|
|
|
- .shutdown = machine_shutdown,
|
|
|
- .emergency_restart = machine_emergency_restart,
|
|
|
- .restart = machine_restart,
|
|
|
- .halt = machine_halt
|
|
|
+ .power_off = native_machine_power_off,
|
|
|
+ .shutdown = native_machine_shutdown,
|
|
|
+ .emergency_restart = native_machine_emergency_restart,
|
|
|
+ .restart = native_machine_restart,
|
|
|
+ .halt = native_machine_halt
|
|
|
};
|
|
|
+
|
|
|
+void machine_power_off(void)
|
|
|
+{
|
|
|
+ machine_ops.power_off();
|
|
|
+}
|
|
|
+
|
|
|
+void machine_shutdown(void)
|
|
|
+{
|
|
|
+ machine_ops.shutdown();
|
|
|
+}
|
|
|
+
|
|
|
+void machine_emergency_restart(void)
|
|
|
+{
|
|
|
+ machine_ops.emergency_restart();
|
|
|
+}
|
|
|
+
|
|
|
+void machine_restart(char *cmd)
|
|
|
+{
|
|
|
+ machine_ops.restart(cmd);
|
|
|
+}
|
|
|
+
|
|
|
+void machine_halt(void)
|
|
|
+{
|
|
|
+ machine_ops.halt();
|
|
|
+}
|
|
|
+
|