From 56a0652b057916c8c35f0f6c4dd6949e1d93384f Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 8 Nov 2011 17:28:31 +0100 Subject: [PATCH] x86/IRQ: create_irq() should call assign_irq_vector() ... rather than __assign_irq_vector(), to ensure desc->affinity gets initialized properly. This at once eliminates the need to forward-declare the latter function. Signed-off-by: Jan Beulich Acked-by: Keir Fraser Acked-by: Andrew Cooper --- xen/arch/x86/irq.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 16b5792d20..eac9e7bc28 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -25,7 +25,6 @@ #include static void parse_irq_vector_map_param(char *s); -static int __assign_irq_vector(int irq, struct irq_desc *, const cpumask_t *); /* opt_noirqbalance: If true, software IRQ balancing/affinity is disabled. */ bool_t __read_mostly opt_noirqbalance = 0; @@ -156,7 +155,6 @@ int __init bind_irq_vector(int irq, int vector, const cpumask_t *cpu_mask) */ int create_irq(void) { - unsigned long flags; int irq, ret; struct irq_desc *desc; @@ -172,11 +170,7 @@ int create_irq(void) ret = init_one_irq_desc(desc); if (!ret) - { - spin_lock_irqsave(&vector_lock, flags); - ret = __assign_irq_vector(irq, desc, TARGET_CPUS); - spin_unlock_irqrestore(&vector_lock, flags); - } + ret = assign_irq_vector(irq); if (ret < 0) { desc->arch.used = IRQ_UNUSED; -- 2.30.2