diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-06-20 19:14:31 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-06-20 19:14:31 +0200 |
| commit | f05218651be1ac6a6088e226bd7350fb6c154414 (patch) | |
| tree | 204ee38c859f08e7e76ea4b6913cdea52cb25d56 /kernel/irq/manage.c | |
| parent | 62a993df31f795d87bcb4c6cb005d36f32f6ad55 (diff) | |
| parent | a614a610ac9b28f195d790d25be72d26f345c53a (diff) | |
Merge branch 'irq/for-x86' into irq/core
Get the infrastructure patches which are required for x86/apic into core
Diffstat (limited to 'kernel/irq/manage.c')
| -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 b1c7e8f46bfb..f9744853b656 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -363,7 +363,7 @@ static int setup_affinity(unsigned int irq, struct irq_desc *desc, struct cpumask *mask) { struct cpumask *set = irq_default_affinity; - int node = desc->irq_data.node; + int node = irq_desc_get_node(desc); /* Excludes PER_CPU and NO_BALANCE interrupts */ if (!irq_can_set_affinity(irq)) |