Power management fixes for 3.9-rc7
- System reboot/halt fix related to CPU offline ordering from Huacai Chen. - intel_pstate driver fix for a delay time computation error occasionally crashing systems using it from Dirk Brandewie. / -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQIcBAABAgAGBQJRZynOAAoJEKhOf7ml8uNsYWcQAIZIps7Ivn2+r3ENL+jhTohx ErEz/cu/YIS/TnDzO3GO+Yo9CcXjUebMWqefIC//YK/K+tNepVOLovthTGiA/X36 23RDRrF1hqZlEgiEfFpuXiyq9u33CbUCYt75tsBXhxJkxeG7J7JfiG4AUh8dED4B nUCbQ4jWM7r9DYJFl2gjDkFt1SjG/UbxcN9Kua9v4zfJil9fKp9093HHYBHH3a2n zXlAE7CskXrNOepwp9Efzu5uPU3gbkIiQdKxvUs91remAcZ3fMsbz8CerZlgfy1S +3f4AuU9i2AXeYI5fanhLo6Mwm8jqBvZ8ZE4Fh/EuQs9eHk7VuRsy7n22zaVeU0A efaldd/pdP7KbSv5Wrs8adQr3GcRHkuHnMGhTlp41tfR8gJfpZUrK3/6h/jnIPRC 1UnBAF4K67v85fBO6gnC8UhEp3MXXXZoPtPByGILxj34KVn+oHzrVgE+8+ugv7HM ZJ5jobYPWrxI2lZv5kuBdHCVg2TAC3YUz2aev8cEhIo4vdcIC2cofVDyAcN9ArqF aF6fcNr6Rgu/M6bB2bP/zbhmDApr8H8z952jss51gprJ+IiKNUh9daiFnYw+o391 9VVTolC7k6P4pXTbtgqEFDLTJ0dKD8i/J4RLHwIsX7jzVgLctyqKZsNXskovjH4p jqIxu/1SPxR2dtBziUEH =bkFT -----END PGP SIGNATURE----- Merge tag 'pm-3.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm Pull power management fixes from Rafael Wysocki: - System reboot/halt fix related to CPU offline ordering from Huacai Chen. - intel_pstate driver fix for a delay time computation error occasionally crashing systems using it from Dirk Brandewie. * tag 'pm-3.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: PM / reboot: call syscore_shutdown() after disable_nonboot_cpus() cpufreq / intel_pstate: Set timer timeout correctly
This commit is contained in:
commit
a3ab02b4c5
@ -502,7 +502,6 @@ static inline void intel_pstate_set_sample_time(struct cpudata *cpu)
|
|||||||
|
|
||||||
sample_time = cpu->pstate_policy->sample_rate_ms;
|
sample_time = cpu->pstate_policy->sample_rate_ms;
|
||||||
delay = msecs_to_jiffies(sample_time);
|
delay = msecs_to_jiffies(sample_time);
|
||||||
delay -= jiffies % delay;
|
|
||||||
mod_timer_pinned(&cpu->timer, jiffies + delay);
|
mod_timer_pinned(&cpu->timer, jiffies + delay);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -324,7 +324,6 @@ void kernel_restart_prepare(char *cmd)
|
|||||||
system_state = SYSTEM_RESTART;
|
system_state = SYSTEM_RESTART;
|
||||||
usermodehelper_disable();
|
usermodehelper_disable();
|
||||||
device_shutdown();
|
device_shutdown();
|
||||||
syscore_shutdown();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -370,6 +369,7 @@ void kernel_restart(char *cmd)
|
|||||||
{
|
{
|
||||||
kernel_restart_prepare(cmd);
|
kernel_restart_prepare(cmd);
|
||||||
disable_nonboot_cpus();
|
disable_nonboot_cpus();
|
||||||
|
syscore_shutdown();
|
||||||
if (!cmd)
|
if (!cmd)
|
||||||
printk(KERN_EMERG "Restarting system.\n");
|
printk(KERN_EMERG "Restarting system.\n");
|
||||||
else
|
else
|
||||||
@ -395,6 +395,7 @@ static void kernel_shutdown_prepare(enum system_states state)
|
|||||||
void kernel_halt(void)
|
void kernel_halt(void)
|
||||||
{
|
{
|
||||||
kernel_shutdown_prepare(SYSTEM_HALT);
|
kernel_shutdown_prepare(SYSTEM_HALT);
|
||||||
|
disable_nonboot_cpus();
|
||||||
syscore_shutdown();
|
syscore_shutdown();
|
||||||
printk(KERN_EMERG "System halted.\n");
|
printk(KERN_EMERG "System halted.\n");
|
||||||
kmsg_dump(KMSG_DUMP_HALT);
|
kmsg_dump(KMSG_DUMP_HALT);
|
||||||
|
Loading…
Reference in New Issue
Block a user