diff options
| author | Ian Campbell <Ian.Campbell@citrix.com> | 2011-02-08 14:03:31 +0000 |
|---|---|---|
| committer | Stefan Bader <stefan.bader@canonical.com> | 2011-11-08 10:10:10 +0100 |
| commit | b24bbd41c8a6ba4afb1c6409156b222645802c30 (patch) | |
| tree | 833318aa04a2ddbe26950226ea791f208a5f16d2 /arch | |
| parent | deee1ac26b2648a307018eb26127bfde6a6ac933 (diff) | |
| download | linux-2.6.32.y-drm33.z-b24bbd41c8a6ba4afb1c6409156b222645802c30.tar.gz | |
xen/timer: Missing IRQF_NO_SUSPEND in timer code broke suspend.
commit f611f2da99420abc973c32cdbddbf5c365d0a20c upstream.
The patches missed an indirect use of IRQF_NO_SUSPEND pulled in via
IRQF_TIMER. The following patch fixes the issue.
With this fixlet PV guest migration works just fine. I also booted the
entire series as a dom0 kernel and it appeared fine.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/xen/time.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index 3e8171608ce84e..8f92188a374b59 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c @@ -395,7 +395,9 @@ void xen_setup_timer(int cpu) name = "<timer kasprintf failed>"; irq = bind_virq_to_irqhandler(VIRQ_TIMER, cpu, xen_timer_interrupt, - IRQF_DISABLED|IRQF_PERCPU|IRQF_NOBALANCING|IRQF_TIMER, + IRQF_DISABLED|IRQF_PERCPU| + IRQF_NOBALANCING|IRQF_TIMER| + IRQF_FORCE_RESUME, name, NULL); evt = &per_cpu(xen_clock_events, cpu); |