diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-12 04:53:33 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-12 04:53:33 -0400 |
| commit | bda9263432072d7879fe13fdaf9dbbd372b4d2fc (patch) | |
| tree | f5619916e1e251b4ce4636d27eb3c591c871a832 /kernel/irq | |
| parent | e27d6cbf38b67bcc2cb23b59c109b7df0fde7f1e (diff) | |
| parent | 7cb7beb31aa3d941833b6a6e553687422c31e4b6 (diff) | |
Merge branch 'linus' into rt/base
Conflicts:
kernel/perf_counter.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq')
| -rw-r--r-- | kernel/irq/numa_migrate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/irq/numa_migrate.c b/kernel/irq/numa_migrate.c index e002f4383b38..23bad34c55b2 100644 --- a/kernel/irq/numa_migrate.c +++ b/kernel/irq/numa_migrate.c | |||
| @@ -107,8 +107,8 @@ out_unlock: | |||
| 107 | 107 | ||
| 108 | struct irq_desc *move_irq_desc(struct irq_desc *desc, int node) | 108 | struct irq_desc *move_irq_desc(struct irq_desc *desc, int node) |
| 109 | { | 109 | { |
| 110 | /* those all static, do move them */ | 110 | /* those static or target node is -1, do not move them */ |
| 111 | if (desc->irq < NR_IRQS_LEGACY) | 111 | if (desc->irq < NR_IRQS_LEGACY || node == -1) |
| 112 | return desc; | 112 | return desc; |
| 113 | 113 | ||
| 114 | if (desc->node != node) | 114 | if (desc->node != node) |