From: Jan Beulich <jbeulich@suse.com>
Date: Mon, 9 Dec 2019 13:03:01 +0000 (+0100)
Subject: x86/i8259A: don't open-code LEGACY_VECTOR()
X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~1077
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b73aad4c8b6a767ce15cc8cb65f9eeab7bfccdae;p=xen.git

x86/i8259A: don't open-code LEGACY_VECTOR()

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c
index 357ffcd085..dfe3521a47 100644
--- a/xen/arch/x86/i8259.c
+++ b/xen/arch/x86/i8259.c
@@ -347,9 +347,9 @@ void __init init_IRQ(void)
         if ( irq == 2 ) /* IRQ2 doesn't exist */
             continue;
         desc->handler = &i8259A_irq_type;
-        per_cpu(vector_irq, cpu)[FIRST_LEGACY_VECTOR + irq] = irq;
+        per_cpu(vector_irq, cpu)[LEGACY_VECTOR(irq)] = irq;
         cpumask_copy(desc->arch.cpu_mask, cpumask_of(cpu));
-        desc->arch.vector = FIRST_LEGACY_VECTOR + irq;
+        desc->arch.vector = LEGACY_VECTOR(irq);
     }
     
     per_cpu(vector_irq, cpu)[IRQ0_VECTOR] = 0;