From 6376974046a0282505208997eeb71fc12f926008 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Tue, 24 Nov 2009 10:16:23 +0000
Subject: [PATCH] --- yaml --- r: 174423 b: refs/heads/master c:
 f350c7922faad3397c98c81a9e5658f5a1ef0214 h: refs/heads/master i:   174421:
 4b125105fd225663e5fa00900d3c85bc28095666   174419:
 b6726b41d3cd51ec028eacd317fed94aef21fcac   174415:
 fb7f438e1b014e5e69457690a8ef874f93c9a23f v: v3

---
 [refs]                    | 2 +-
 trunk/arch/x86/xen/time.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 = "<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);