lkml.org 
[lkml]   [2009]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 1/3] x86: apic, restore irqs on fail paths
[Jiri Slaby - Thu, May 28, 2009 at 09:54:47AM +0200]
|
| lapic_resume forgets to restore interrupts on fail paths.
| Fix that.

Good catch, Jiri!

Acked-by: Cyrill Gorcunov <gorcunov@openvz.org>

Though I really doubt if the system will be functional after such a fail :)
But it's definitely better then having it irq-locked.

Yinghai CC'ed just to be sure.

|
| Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
| Cc: Ingo Molnar <mingo@redhat.com>
| Cc: Thomas Gleixner <tglx@linutronix.de>
| Cc: H. Peter Anvin <hpa@zytor.com>
| ---
| arch/x86/kernel/apic/apic.c | 11 ++++++-----
| 1 files changed, 6 insertions(+), 5 deletions(-)
|
| diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
| index 07cffc1..fc65544 100644
| --- a/arch/x86/kernel/apic/apic.c
| +++ b/arch/x86/kernel/apic/apic.c
| @@ -2029,7 +2029,7 @@ static int lapic_resume(struct sys_device *dev)
| unsigned int l, h;
| unsigned long flags;
| int maxlvt;
| - int ret;
| + int ret = 0;
| struct IO_APIC_route_entry **ioapic_entries = NULL;
|
| if (!apic_pm_state.active)
| @@ -2040,14 +2040,15 @@ static int lapic_resume(struct sys_device *dev)
| ioapic_entries = alloc_ioapic_entries();
| if (!ioapic_entries) {
| WARN(1, "Alloc ioapic_entries in lapic resume failed.");
| - return -ENOMEM;
| + ret = -ENOMEM;
| + goto restore;
| }
|
| ret = save_IO_APIC_setup(ioapic_entries);
| if (ret) {
| WARN(1, "Saving IO-APIC state failed: %d\n", ret);
| free_ioapic_entries(ioapic_entries);
| - return ret;
| + goto restore;
| }
|
| mask_IO_APIC_setup(ioapic_entries);
| @@ -2099,10 +2100,10 @@ static int lapic_resume(struct sys_device *dev)
| restore_IO_APIC_setup(ioapic_entries);
| free_ioapic_entries(ioapic_entries);
| }
| -
| +restore:
| local_irq_restore(flags);
|
| - return 0;
| + return ret;
| }
|
| /*
| --
| 1.6.3
|
|
-- Cyrill


\
 
 \ /
  Last update: 2009-05-29 19:25    [W:0.051 / U:16.348 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site