patch-2.3.25 linux/arch/i386/kernel/process.c

• Lines: 34
• Date: Mon Nov 1 13:32:10 1999
• Orig file: v2.3.24/linux/arch/i386/kernel/process.c
• Orig date: Wed Oct 27 16:34:12 1999

diff -u --recursive --new-file v2.3.24/linux/arch/i386/kernel/process.c linux/arch/i386/kernel/process.c
@@ -29,9 +29,6 @@
 #include <linux/delay.h>
 #include <linux/reboot.h>
 #include <linux/init.h>
-#if defined(CONFIG_APM) && defined(CONFIG_APM_POWER_OFF)
-#include <linux/apm_bios.h>
-#endif
 
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
@@ -67,6 +64,11 @@
 void (*acpi_idle)(void) = NULL;
 
 /*
+ * Power off function, if any
+ */
+void (*acpi_power_off)(void) = NULL;
+
+/*
  * The idle thread. There's no useful work to be
  * done, so just try to conserve power and have a
  * low exit latency (ie sit in a loop waiting for
@@ -310,9 +312,8 @@
 
 void machine_power_off(void)
 {
-#if defined(CONFIG_APM) && defined(CONFIG_APM_POWER_OFF)
-	apm_power_off();
-#endif
+	if (acpi_power_off)
+		acpi_power_off();
 }