From a5e8628b13fc27456aa462f1cc898fc2d0e76547 Mon Sep 17 00:00:00 2001 From: Yoichi Yuasa Date: Thu, 16 Aug 2007 22:27:05 +0900 Subject: [PATCH] --- yaml --- r: 66143 b: refs/heads/master c: fa41780606e7a5999a9096269c0ad8e7cee2b95b h: refs/heads/master i: 66141: 8ae5e134a6e0be958837809cf37cc10ec55d18d7 66139: 42780da6f34bec2327a342d7d15782e07dacf930 66135: ada84aec801f8dba5a1ee524e295411c37158792 66127: 0572cce958a125a371fa763356ac0f173a9f4759 66111: 861b91d89e5a826d88829e217dd4e3b3a891f9a6 v: v3 --- [refs] | 2 +- trunk/arch/mips/vr41xx/common/pmu.c | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index f2531380e4ba..ab4ce365eceb 100644 --- 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 index ba0a4f6483a2..ad5b6db53396 100644 --- 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; }