aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2008-05-23 09:41:19 -0400
committerThomas Gleixner <tglx@linutronix.de>2008-05-26 17:26:32 -0400
commitd031476408ae0f5196e3c579f519dfdefb099b67 (patch)
tree112984e1708664079fb49bd22caec92144b56a04
parente490517a039a99d692cb3a5561941b0a5f576172 (diff)
hrtimer: remove warning in hres_timers_resume
hres_timers_resume() warns if there appears to be more than one cpu online. This warning makes sense when the suspend/resume mechanism offlines all cpus but one during the suspend/resume process. However, Xen suspend does not need to offline the other cpus; it merely keeps them tied up in stop_machine() while the virtual machine is suspended. The warning hres_timers_resume issues is therefore spurious. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Cc: xen-devel <xen-devel@lists.xensource.com> Cc: "Rafael J. Wysocki" <rjw@sisk.pl> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--kernel/hrtimer.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index 421be5fe5cc7..493c4b8b8cba 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -632,8 +632,6 @@ void clock_was_set(void)
632 */ 632 */
633void hres_timers_resume(void) 633void hres_timers_resume(void)
634{ 634{
635 WARN_ON_ONCE(num_online_cpus() > 1);
636
637 /* Retrigger the CPU local events: */ 635 /* Retrigger the CPU local events: */
638 retrigger_next_event(NULL); 636 retrigger_next_event(NULL);
639} 637}