Skip to content

Commit

Permalink
Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/li…
Browse files Browse the repository at this point in the history
…nux/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
  • Loading branch information
Linus Torvalds committed Aug 10, 2009
2 parents a326396 + ad7d6c7 commit cec3691
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions kernel/irq/numa_migrate.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ static struct irq_desc *__real_move_irq_desc(struct irq_desc *old_desc,

struct irq_desc *move_irq_desc(struct irq_desc *desc, int node)
{
/* those all static, do move them */
if (desc->irq < NR_IRQS_LEGACY)
/* those static or target node is -1, do not move them */
if (desc->irq < NR_IRQS_LEGACY || node == -1)
return desc;

if (desc->node != node)
Expand Down

0 comments on commit cec3691

Please sign in to comment.