patch-2.4.23 linux-2.4.23/arch/ppc/kernel/idle_gen.c

Next file: linux-2.4.23/arch/ppc/kernel/indirect_pci.c
Previous file: linux-2.4.23/arch/ppc/kernel/ibm44x_common.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.22/arch/ppc/kernel/idle_gen.c linux-2.4.23/arch/ppc/kernel/idle_gen.c
@@ -15,10 +15,15 @@
 
 void power_save(void)
 {
-	/* Make sure the CPU has the DOZE feature set. */
+	/*
+	 * Make sure the CPU has the DOZE or NAP feature set.
+	 * We assume that chip-specific initialization code
+	 * has set any other registers necessary (e.g. HID0).
+	 */
 	if (!(cur_cpu_spec[smp_processor_id()]->cpu_features
-				& CPU_FTR_CAN_DOZE))
+	      & (CPU_FTR_CAN_DOZE | CPU_FTR_CAN_NAP)))
 		return;
+
 	/*
 	 * Disable interrupts to prevent a lost wakeup
 	 * when going to sleep.  This is necessary even with

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)