diff options
| author | Dave Airlie <[email protected]> | 2015-08-24 16:36:42 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2015-08-24 16:36:42 +1000 |
| commit | 3732ce72b45a2a145803558758821bf198751276 (patch) | |
| tree | 75047ed1f43cfd56231535c401924dbb27c4d0f0 /arch/x86/kernel/apic/vector.c | |
| parent | e829d7ef9f17d7b84d4c3d110ecd4b7b2bcba865 (diff) | |
| parent | c13dcf9f2d6f5f06ef1bf79ec456df614c5e058b (diff) | |
Merge tag 'v4.2-rc8' into drm-next
Linux 4.2-rc8
Backmerge required for Intel so they can fix their -next tree up properly.
Diffstat (limited to 'arch/x86/kernel/apic/vector.c')
| -rw-r--r-- | arch/x86/kernel/apic/vector.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c index f813261d9740..2683f36e4e0a 100644 --- a/arch/x86/kernel/apic/vector.c +++ b/arch/x86/kernel/apic/vector.c @@ -322,7 +322,7 @@ static int x86_vector_alloc_irqs(struct irq_domain *domain, unsigned int virq, irq_data->chip = &lapic_controller; irq_data->chip_data = data; irq_data->hwirq = virq + i; - err = assign_irq_vector_policy(virq, irq_data->node, data, + err = assign_irq_vector_policy(virq + i, irq_data->node, data, info); if (err) goto error; |