---

yaml --- r: 66143 b: refs/heads/master c: fa41780 h: refs/heads/master i: 66141: 8ae5e13 66139: 42780da 66135: ada84ae 66127: 0572cce 66111: 861b91d v: v3
git-mirror · Oct 11, 2007 · a5e8628 · a5e8628
1 parent 8eadd63
commit a5e8628
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f2a2d9987c4836493bfb2a80960056ef86742d2
+refs/heads/master: fa41780606e7a5999a9096269c0ad8e7cee2b95b
diff --git a/trunk/arch/mips/vr41xx/common/pmu.c b/trunk/arch/mips/vr41xx/common/pmu.c
@@ -91,14 +91,7 @@ static void vr41xx_halt(void)
 {
 	local_irq_disable();
 	printk(KERN_NOTICE "\nYou can turn off the power supply\n");
-	while (1) ;
-}
-
-static void vr41xx_power_off(void)
-{
-	local_irq_disable();
-	printk(KERN_NOTICE "\nYou can turn off the power supply\n");
-	while (1) ;
+	__asm__("hibernate;\n");
 }
 
 static int __init vr41xx_pmu_init(void)
@@ -134,7 +127,7 @@ static int __init vr41xx_pmu_init(void)
 	cpu_wait = vr41xx_cpu_wait;
 	_machine_restart = vr41xx_restart;
 	_machine_halt = vr41xx_halt;
-	pm_power_off = vr41xx_power_off;
+	pm_power_off = vr41xx_halt;
 
 	return 0;
 }