[Xen-changelog] [xen stable-4.1] ACPI/APEI: Unlock apei_iomaps_lock on error path

[patchbot@xxxxxxx]

commit 1745fb53ae0bb483767473e3c95d3420a5fb10e3
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Tue Apr 2 12:37:28 2013 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue Apr 2 12:37:28 2013 +0200

    ACPI/APEI: Unlock apei_iomaps_lock on error path
    
    This causes deadlocks during early boot on hardware with broken/buggy
    APEI implementations, such as a Dell Poweredge 2950 with the latest
    currently available BIOS.
    
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    
    Don't use goto or another special error path, as handling the error
    case in normal flow is quite simple.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    master commit: 0611689d9153227831979c7bafe594214b8505a3
    master date: 2013-03-22 09:43:38 +0100
---
 xen/drivers/acpi/apei/apei-io.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/xen/drivers/acpi/apei/apei-io.c b/xen/drivers/acpi/apei/apei-io.c
index d57035b..f0f4636 100644
--- a/xen/drivers/acpi/apei/apei-io.c
+++ b/xen/drivers/acpi/apei/apei-io.c
@@ -146,10 +146,8 @@ static void __init apei_post_unmap(paddr_t paddr, unsigned 
long size)
 
        spin_lock_irqsave(&apei_iomaps_lock, flags);
        map = __apei_find_iomap(paddr, size);
-       if (!map)
-               return;
-
-       list_del(&map->list);
+       if (map)
+               list_del(&map->list);
        spin_unlock_irqrestore(&apei_iomaps_lock, flags);
 
        xfree(map);
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.1

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog