From 81c1949553b938c1bf51c34ee28a88b72232f694 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Wed, 23 May 2012 13:28:44 -0400 Subject: [PATCH] --- yaml --- r: 310927 b: refs/heads/master c: 5e152e6c4b0da84c66cad56597b42c4ecedb0448 h: refs/heads/master i: 310925: c4204fa39a301b33722d9079ff2972b00630893b 310923: 2a0fee46344fccab771180d82bfa65a447acc318 310919: dfcf3d8f19ef6add34017feba47b4eca99d93a96 310911: e423e270d8b1f363e294abd7f9c6e763f34267de v: v3 --- [refs] | 2 +- trunk/drivers/xen/events.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 61ba55cb8398..e10fceee615d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5842f5768599094758931b74190cdf93641a8e35 +refs/heads/master: 5e152e6c4b0da84c66cad56597b42c4ecedb0448 diff --git a/trunk/drivers/xen/events.c b/trunk/drivers/xen/events.c index faae2f910ad2..af8b8fbd9d88 100644 --- a/trunk/drivers/xen/events.c +++ b/trunk/drivers/xen/events.c @@ -827,6 +827,9 @@ int bind_evtchn_to_irq(unsigned int evtchn) handle_edge_irq, "event"); xen_irq_info_evtchn_init(irq, evtchn); + } else { + struct irq_info *info = info_for_irq(irq); + WARN_ON(info == NULL || info->type != IRQT_EVTCHN); } out: @@ -862,6 +865,9 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu) xen_irq_info_ipi_init(cpu, irq, evtchn, ipi); bind_evtchn_to_cpu(evtchn, cpu); + } else { + struct irq_info *info = info_for_irq(irq); + WARN_ON(info == NULL || info->type != IRQT_IPI); } out: @@ -939,6 +945,9 @@ int bind_virq_to_irq(unsigned int virq, unsigned int cpu) xen_irq_info_virq_init(cpu, irq, evtchn, virq); bind_evtchn_to_cpu(evtchn, cpu); + } else { + struct irq_info *info = info_for_irq(irq); + WARN_ON(info == NULL || info->type != IRQT_VIRQ); } out: