From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Stodden Subject: [PATCH] kernel: Fix pvops build on 2.6.38. Date: Thu, 3 Mar 2011 12:52:55 -0800 Message-ID: <1299185575-17375-2-git-send-email-daniel.stodden@citrix.com> References: <1299185575-17375-1-git-send-email-daniel.stodden@citrix.com> Return-path: In-Reply-To: <1299185575-17375-1-git-send-email-daniel.stodden@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Xen Cc: jeremy@goop.org, Ian.Campbell@citrix.com, Daniel Stodden List-Id: xen-devel@lists.xenproject.org --- arch/x86/xen/time.c | 2 +- drivers/xen/events.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index 2e2d370..1f48076 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c @@ -399,7 +399,7 @@ void xen_setup_timer(int cpu) irq = bind_virq_to_irqhandler(VIRQ_TIMER, cpu, xen_timer_interrupt, IRQF_DISABLED|IRQF_PERCPU| IRQF_NOBALANCING|IRQF_TIMER| - IRQF_FORCE_RESUME, + IRQF_NO_SUSPEND, name, NULL); evt = &per_cpu(xen_clock_events, cpu); diff --git a/drivers/xen/events.c b/drivers/xen/events.c index 916d9a8..d4251ad 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c @@ -1026,7 +1026,7 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi, if (irq < 0) return irq; - irqflags |= IRQF_NO_SUSPEND | IRQF_FORCE_RESUME; + irqflags |= IRQF_NO_SUSPEND; retval = request_irq(irq, handler, irqflags, devname, dev_id); if (retval != 0) { unbind_from_irq(irq); -- 1.7.0.4