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

Commit fc2e3180 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irq-fixes-for-linus' of... 

Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86/irq: mark NUMA_MIGRATE_IRQ_DESC broken
  x86, irq: Remove IRQ_DISABLED check in process context IRQ move
parents 1e4b9781 ca713c2a

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -277,6 +277,7 @@ config SPARSE_IRQ 
config NUMA_MIGRATE_IRQ_DESC

	bool "Move irq desc when changing irq smp_affinity"

	depends on SPARSE_IRQ && NUMA

	depends on BROKEN

	default n

	---help---

	  This enables moving irq_desc to cpu/node that irq will use handled.

arch/x86/kernel/apic/io_apic.c

+2 −0
Original line number Diff line number Diff line
@@ -3670,12 +3670,14 @@ int arch_setup_hpet_msi(unsigned int irq) 
{

	int ret;

	struct msi_msg msg;

	struct irq_desc *desc = irq_to_desc(irq);



	ret = msi_compose_msg(NULL, irq, &msg);

	if (ret < 0)

		return ret;



	hpet_msi_write(irq, &msg);

	desc->status |= IRQ_MOVE_PCNTXT;

	set_irq_chip_and_handler_name(irq, &hpet_msi_type, handle_edge_irq,

		"edge");

kernel/irq/manage.c

+2 −3
Original line number Diff line number Diff line
@@ -109,10 +109,9 @@ int irq_set_affinity(unsigned int irq, const struct cpumask *cpumask) 
	spin_lock_irqsave(&desc->lock, flags);



#ifdef CONFIG_GENERIC_PENDING_IRQ

	if (desc->status & IRQ_MOVE_PCNTXT || desc->status & IRQ_DISABLED) {

		cpumask_copy(desc->affinity, cpumask);

	if (desc->status & IRQ_MOVE_PCNTXT)

		desc->chip->set_affinity(irq, cpumask);

	} else {

	else {

		desc->status |= IRQ_MOVE_PENDING;

		cpumask_copy(desc->pending_mask, cpumask);

	}