diff --git a/[refs] b/[refs] index 356ee44ae22b..afe7733154c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aa673c1cb3a66d0b37595251c4e8bb688efc8726 +refs/heads/master: f611f2da99420abc973c32cdbddbf5c365d0a20c diff --git a/trunk/arch/x86/xen/time.c b/trunk/arch/x86/xen/time.c index 067759e3d6a5..2e2d370a47b1 100644 --- a/trunk/arch/x86/xen/time.c +++ b/trunk/arch/x86/xen/time.c @@ -397,7 +397,9 @@ void xen_setup_timer(int cpu) name = ""; 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);