From: Jan Beulich <jbeulich@suse.com>
Date: Tue, 15 May 2012 07:18:02 +0000 (+0200)
Subject: x86: fix i8259A_resume()
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~8467
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=85c4d8a2ab3904353d88a4f79de164b7fda79adb;p=xen.git

x86: fix i8259A_resume()

On systems that have an IO-APIC, we generally run the PIC in AEOI
mode, yet i8259A_resume() so far failed to put it back into that mode.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
---

diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c
index ee291d3edf..2cbda3cb76 100644
--- a/xen/arch/x86/i8259.c
+++ b/xen/arch/x86/i8259.c
@@ -314,7 +314,7 @@ static void save_ELCR(char *trigger)
 
 int i8259A_resume(void)
 {
-    init_8259A(0);
+    init_8259A(i8259A_irq_type.ack == disable_8259A_irq);
     restore_ELCR(irq_trigger);
     return 0;
 }