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

• Lines: 43
• Date: Sun Feb 20 20:37:09 2000
• Orig file: v2.3.46/linux/arch/i386/kernel/process.c
• Orig date: Thu Feb 10 17:11:03 2000

diff -u --recursive --new-file v2.3.46/linux/arch/i386/kernel/process.c linux/arch/i386/kernel/process.c
@@ -48,16 +48,6 @@
 
 int hlt_counter=0;
 
-void disable_hlt(void)
-{
-	hlt_counter++;
-}
-
-void enable_hlt(void)
-{
-	hlt_counter--;
-}
-
 /*
  * Powermanagement idle function, if any..
  */
@@ -68,6 +58,16 @@
  */
 void (*pm_power_off)(void) = NULL;
 
+void disable_hlt(void)
+{
+	hlt_counter++;
+}
+
+void enable_hlt(void)
+{
+	hlt_counter--;
+}
+
 /*
  * We use this if we don't have any better
  * idle routine..
@@ -293,7 +293,7 @@
 
 void machine_restart(char * __unused)
 {
-#if __SMP__
+#if CONFIG_SMP
 	/*
 	 * Stop all CPUs and turn off local APICs and the IO-APIC, so
 	 * other OSs see a clean IRQ state.