Merge tag 'pm-3.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (a3ab02b4) · Commits · 戴 / test

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

drivers/cpufreq/intel_pstate.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -502,7 +502,6 @@ static inline void intel_pstate_set_sample_time(struct cpudata *cpu)

		sample_time = cpu->pstate_policy->sample_rate_ms;
		delay = msecs_to_jiffies(sample_time);
		delay -= jiffies % delay;
		mod_timer_pinned(&cpu->timer, jiffies + delay);
		}

kernel/sys.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -324,7 +324,6 @@ void kernel_restart_prepare(char *cmd)
		system_state = SYSTEM_RESTART;
		usermodehelper_disable();
		device_shutdown();
		syscore_shutdown();
		}

		/**
		@@ -370,6 +369,7 @@ void kernel_restart(char *cmd)
		{
		kernel_restart_prepare(cmd);
		disable_nonboot_cpus();
		syscore_shutdown();
		if (!cmd)
		printk(KERN_EMERG "Restarting system.\n");
		else
		@@ -395,6 +395,7 @@ static void kernel_shutdown_prepare(enum system_states state)
		void kernel_halt(void)
		{
		kernel_shutdown_prepare(SYSTEM_HALT);
		disable_nonboot_cpus();
		syscore_shutdown();
		printk(KERN_EMERG "System halted.\n");
		kmsg_dump(KMSG_DUMP_HALT);

Admin message