forked from luck/tmp_suning_uos_patched
x86, apic: Restore irqs on fail paths
lapic_resume forgets to restore interrupts on fail paths. Fix that. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Acked-by: Cyrill Gorcunov <gorcunov@openvz.org> LKML-Reference: <1243497289-18591-1-git-send-email-jirislaby@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Cc: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
parent
58f892e022
commit
3d58829b05
@ -2027,7 +2027,7 @@ static int lapic_resume(struct sys_device *dev)
|
|||||||
unsigned int l, h;
|
unsigned int l, h;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
int maxlvt;
|
int maxlvt;
|
||||||
int ret;
|
int ret = 0;
|
||||||
struct IO_APIC_route_entry **ioapic_entries = NULL;
|
struct IO_APIC_route_entry **ioapic_entries = NULL;
|
||||||
|
|
||||||
if (!apic_pm_state.active)
|
if (!apic_pm_state.active)
|
||||||
@ -2038,14 +2038,15 @@ static int lapic_resume(struct sys_device *dev)
|
|||||||
ioapic_entries = alloc_ioapic_entries();
|
ioapic_entries = alloc_ioapic_entries();
|
||||||
if (!ioapic_entries) {
|
if (!ioapic_entries) {
|
||||||
WARN(1, "Alloc ioapic_entries in lapic resume failed.");
|
WARN(1, "Alloc ioapic_entries in lapic resume failed.");
|
||||||
return -ENOMEM;
|
ret = -ENOMEM;
|
||||||
|
goto restore;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = save_IO_APIC_setup(ioapic_entries);
|
ret = save_IO_APIC_setup(ioapic_entries);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
WARN(1, "Saving IO-APIC state failed: %d\n", ret);
|
WARN(1, "Saving IO-APIC state failed: %d\n", ret);
|
||||||
free_ioapic_entries(ioapic_entries);
|
free_ioapic_entries(ioapic_entries);
|
||||||
return ret;
|
goto restore;
|
||||||
}
|
}
|
||||||
|
|
||||||
mask_IO_APIC_setup(ioapic_entries);
|
mask_IO_APIC_setup(ioapic_entries);
|
||||||
@ -2097,10 +2098,10 @@ static int lapic_resume(struct sys_device *dev)
|
|||||||
restore_IO_APIC_setup(ioapic_entries);
|
restore_IO_APIC_setup(ioapic_entries);
|
||||||
free_ioapic_entries(ioapic_entries);
|
free_ioapic_entries(ioapic_entries);
|
||||||
}
|
}
|
||||||
|
restore:
|
||||||
local_irq_restore(flags);
|
local_irq_restore(flags);
|
||||||
|
|
||||||
return 0;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user