diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-15 18:06:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-15 18:06:35 -0400 |
| commit | 30df754dedebf27ef90452944a723ba058d23396 (patch) | |
| tree | 80685c0377dec0980b31cdecf52114747224da3f /kernel | |
| parent | 9ecb42fda614c4e4f46e95712621510f8d746980 (diff) | |
| parent | 1fb0ef31f428f345a7c3666f8e7444a563edd537 (diff) | |
Merge branch 'irq/numa' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/manage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 094fafe86c96..b0c900520517 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
| @@ -179,7 +179,7 @@ static void irq_affinity_notify(struct work_struct *work) | |||
| 179 | cpumask_copy(cpumask, desc->pending_mask); | 179 | cpumask_copy(cpumask, desc->pending_mask); |
| 180 | else | 180 | else |
| 181 | #endif | 181 | #endif |
| 182 | cpumask_copy(cpumask, desc->affinity); | 182 | cpumask_copy(cpumask, desc->irq_data.affinity); |
| 183 | raw_spin_unlock_irqrestore(&desc->lock, flags); | 183 | raw_spin_unlock_irqrestore(&desc->lock, flags); |
| 184 | 184 | ||
| 185 | notify->notify(notify, cpumask); | 185 | notify->notify(notify, cpumask); |