Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a2db49d authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: uv: Use irq_alloc/free_hwirq() 



No functional change. The request to allocate the irq above
NR_IRQS_LEGACY is completely pointless as the implementation enforces
that the dynamic allocations are above the GSI interrupts, which
includes the legacy PIT irqs.

This does not replace the requirement to move x86 to irq domains, but
it limits the mess to some degree.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarGrant Likely <grant.likely@linaro.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: x86@kernel.org
Link: http://lkml.kernel.org/r/20140507154335.252789823@linutronix.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 499c2b75

arch/x86/platform/uv/uv_irq.c

+4 −6
Original line number Diff line number Diff line
@@ -238,11 +238,9 @@ uv_set_irq_affinity(struct irq_data *data, const struct cpumask *mask, 
int uv_setup_irq(char *irq_name, int cpu, int mmr_blade,

		 unsigned long mmr_offset, int limit)

{

	int irq, ret;

	int ret, irq = irq_alloc_hwirq(uv_blade_to_memory_nid(mmr_blade));



	irq = create_irq_nr(NR_IRQS_LEGACY, uv_blade_to_memory_nid(mmr_blade));



	if (irq <= 0)

	if (!irq)

		return -EBUSY;



	ret = arch_enable_uv_irq(irq_name, irq, cpu, mmr_blade, mmr_offset,
@@ -250,7 +248,7 @@ int uv_setup_irq(char *irq_name, int cpu, int mmr_blade, 
	if (ret == irq)

		uv_set_irq_2_mmr_info(irq, mmr_offset, mmr_blade);

	else

		destroy_irq(irq);

		irq_free_hwirq(irq);



	return ret;

}
@@ -285,6 +283,6 @@ void uv_teardown_irq(unsigned int irq) 
			n = n->rb_right;

	}

	spin_unlock_irqrestore(&uv_irq_lock, irqflags);

	destroy_irq(irq);

	irq_free_hwirq(irq);

}

EXPORT_SYMBOL_GPL(uv_teardown_irq);