diff options
Diffstat (limited to 'arch/x86_64/kernel/i8259.c')
-rw-r--r-- | arch/x86_64/kernel/i8259.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/i8259.c b/arch/x86_64/kernel/i8259.c index d2f5acde5749..2dd51f364ea2 100644 --- a/arch/x86_64/kernel/i8259.c +++ b/arch/x86_64/kernel/i8259.c | |||
@@ -123,6 +123,8 @@ void (*interrupt[NR_IRQS])(void) = { | |||
123 | 123 | ||
124 | DEFINE_SPINLOCK(i8259A_lock); | 124 | DEFINE_SPINLOCK(i8259A_lock); |
125 | 125 | ||
126 | static int i8259A_auto_eoi; | ||
127 | |||
126 | static void end_8259A_irq (unsigned int irq) | 128 | static void end_8259A_irq (unsigned int irq) |
127 | { | 129 | { |
128 | if (irq > 256) { | 130 | if (irq > 256) { |
@@ -336,6 +338,8 @@ void init_8259A(int auto_eoi) | |||
336 | { | 338 | { |
337 | unsigned long flags; | 339 | unsigned long flags; |
338 | 340 | ||
341 | i8259A_auto_eoi = auto_eoi; | ||
342 | |||
339 | spin_lock_irqsave(&i8259A_lock, flags); | 343 | spin_lock_irqsave(&i8259A_lock, flags); |
340 | 344 | ||
341 | outb(0xff, 0x21); /* mask all of 8259A-1 */ | 345 | outb(0xff, 0x21); /* mask all of 8259A-1 */ |
@@ -394,7 +398,7 @@ static void save_ELCR(char *trigger) | |||
394 | 398 | ||
395 | static int i8259A_resume(struct sys_device *dev) | 399 | static int i8259A_resume(struct sys_device *dev) |
396 | { | 400 | { |
397 | init_8259A(0); | 401 | init_8259A(i8259A_auto_eoi); |
398 | restore_ELCR(irq_trigger); | 402 | restore_ELCR(irq_trigger); |
399 | return 0; | 403 | return 0; |
400 | } | 404 | } |