sched: Fold updating of the last_update_time_info into update_ts_time_stats()

[safe/jmp/linux-2.6] / kernel / power / poweroff.c

diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c
index 72016f0..e8b3370 100644 (file)
--- a/kernel/power/poweroff.c
+++ b/kernel/power/poweroff.c
@@ -27,14 +27,14 @@ static DECLARE_WORK(poweroff_work, do_poweroff);
 static void handle_poweroff(int key, struct tty_struct *tty)
 {
        /* run sysrq poweroff on boot cpu */
-       schedule_work_on(first_cpu(cpu_online_map), &poweroff_work);
+       schedule_work_on(cpumask_first(cpu_online_mask), &poweroff_work);
 }
 
 static struct sysrq_key_op     sysrq_poweroff_op = {
        .handler        = handle_poweroff,
        .help_msg       = "powerOff",
        .action_msg     = "Power Off",
-       .enable_mask    = SYSRQ_ENABLE_BOOT,
+       .enable_mask    = SYSRQ_ENABLE_BOOT,
 };
 
 static int pm_sysrq_init(void)