]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
hrtimer: remove warning in hres_timers_resume
authorJeremy Fitzhardinge <jeremy@goop.org>
Fri, 23 May 2008 13:41:19 +0000 (14:41 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 26 May 2008 21:26:32 +0000 (23:26 +0200)
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>
kernel/hrtimer.c

index 421be5fe5cc78f5d2be0eabd3ba2367fe1b15b3e..493c4b8b8cbabaecff8262592bb7207979c74a2d 100644 (file)
@@ -632,8 +632,6 @@ void clock_was_set(void)
  */
 void hres_timers_resume(void)
 {
-       WARN_ON_ONCE(num_online_cpus() > 1);
-
        /* Retrigger the CPU local events: */
        retrigger_next_event(NULL);
 }