diff --git a/[refs] b/[refs] index 2cabb3fbe275..fa66fdae8f4a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa24ba62ea2869308ffc9f0b286ac9650b4ca6cb +refs/heads/master: f350c7922faad3397c98c81a9e5658f5a1ef0214 diff --git a/trunk/arch/x86/xen/time.c b/trunk/arch/x86/xen/time.c index 6bbff94328d2..9d1f853120d8 100644 --- a/trunk/arch/x86/xen/time.c +++ b/trunk/arch/x86/xen/time.c @@ -434,7 +434,7 @@ 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_DISABLED|IRQF_PERCPU|IRQF_NOBALANCING|IRQF_TIMER, name, NULL); evt = &per_cpu(xen_clock_events, cpu);