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

Commit cec36911 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: Fix move_irq_desc() for nodes without ram
parents a3263969 ad7d6c7a

kernel/irq/numa_migrate.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -107,8 +107,8 @@ out_unlock: 




struct irq_desc *move_irq_desc(struct irq_desc *desc, int node)

struct irq_desc *move_irq_desc(struct irq_desc *desc, int node)

{

{

	/* those all static, do move them */

	/* those static or target node is -1, do not move them */

	if (desc->irq < NR_IRQS_LEGACY)

	if (desc->irq < NR_IRQS_LEGACY || node == -1)

		return desc;

		return desc;





	if (desc->node != node)

	if (desc->node != node)