From bbf9f1edaf8097c5fad22ad8207c286e806e3d53 Mon Sep 17 00:00:00 2001 From: Wu Zhangjin Date: Wed, 27 Jan 2010 22:39:46 +0800 Subject: [PATCH] --- yaml --- r: 182083 b: refs/heads/master c: fc48c41af81b953578a54f80ad07d2f1efa81378 h: refs/heads/master i: 182081: e473496c8a59687a45067fa575373776483ac665 182079: 7af2a49d253151bf9839e2850e8b4f456aef08b2 v: v3 --- [refs] | 2 +- trunk/arch/mips/loongson/common/reset.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f2869d8a09f0..ce080e85b125 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e52dd9fc6b9e0c17b220bd38371ff15032a1a155 +refs/heads/master: fc48c41af81b953578a54f80ad07d2f1efa81378 diff --git a/trunk/arch/mips/loongson/common/reset.c b/trunk/arch/mips/loongson/common/reset.c index 33dff188b4de..4bd9c18b07a5 100644 --- a/trunk/arch/mips/loongson/common/reset.c +++ b/trunk/arch/mips/loongson/common/reset.c @@ -25,17 +25,26 @@ static void loongson_restart(char *command) ((void (*)(void))ioremap_nocache(LOONGSON_BOOT_BASE, 4)) (); } -static void loongson_halt(void) +static void loongson_poweroff(void) { mach_prepare_shutdown(); unreachable(); } +static void loongson_halt(void) +{ + pr_notice("\n\n** You can safely turn off the power now **\n\n"); + while (1) { + if (cpu_wait) + cpu_wait(); + } +} + static int __init mips_reboot_setup(void) { _machine_restart = loongson_restart; _machine_halt = loongson_halt; - pm_power_off = loongson_halt; + pm_power_off = loongson_poweroff; return 0; }