diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2009-11-24 10:16:23 +0000 |
|---|---|---|
| committer | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2009-12-03 11:14:52 -0800 |
| commit | f350c7922faad3397c98c81a9e5658f5a1ef0214 (patch) | |
| tree | 3fda7c98ecace637a68e91d0c46934b06cece954 /arch | |
| parent | fa24ba62ea2869308ffc9f0b286ac9650b4ca6cb (diff) | |
| download | op-kernel-dev-f350c7922faad3397c98c81a9e5658f5a1ef0214.zip op-kernel-dev-f350c7922faad3397c98c81a9e5658f5a1ef0214.tar.gz | |
xen: register timer interrupt with IRQF_TIMER
Otherwise the timer is disabled by dpm_suspend_noirq() which in turn prevents
correct operation of stop_machine on multi-processor systems and breaks
suspend.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Stable Kernel <stable@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/xen/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index 6bbff94..9d1f853 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c @@ -434,7 +434,7 @@ 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_DISABLED|IRQF_PERCPU|IRQF_NOBALANCING|IRQF_TIMER, name, NULL); evt = &per_cpu(xen_clock_events, cpu); |
