summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-04-11 20:33:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-11 20:33:38 -0700
commita3ab02b4c5d2ba0eff137a9442b80944ce2d9366 (patch)
tree236fb818fd1bde59c61a1a7b89851e480573a343 /drivers
parent89a132ac273815c3f573684f7a79840e8930d3e1 (diff)
parent6f389a8f1dd22a24f3d9afc2812b30d639e94625 (diff)
downloadlinux-a3ab02b4c5d2ba0eff137a9442b80944ce2d9366.tar.bz2
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/cpufreq/intel_pstate.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index ad72922919ed..6133ef5cf671 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -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);
}