diff options
| author | Ian Campbell <Ian.Campbell@citrix.com> | 2011-02-08 14:03:31 +0000 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-08-17 15:35:39 -0400 |
| commit | 6afb44e14bfc95f7aa57d1cd109a4c99ff145008 (patch) | |
| tree | 9ca6b309f1f991fe122d24c0a83d94467e5627e0 /arch | |
| parent | 646c97408dc636ce5a4ffeaa285d070b0ea47e43 (diff) | |
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: Paul Gortmaker <paul.gortmaker@windriver.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 a05bda6bf1e..fb2b3888ea0 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c @@ -396,7 +396,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); |